Merge remote-tracking branch 'origin/savagex/courfun-nexball'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 5 Jan 2012 09:29:46 +0000 (10:29 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 5 Jan 2012 09:29:46 +0000 (10:29 +0100)

Trivial merge