Merge branch 'master' into fruitiex/warpzone
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 11:10:57 +0000 (13:10 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 11:10:57 +0000 (13:10 +0200)

Trivial merge