Merge remote branch 'refs/remotes/origin/mookow/map-g-23'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 19 Aug 2010 05:10:35 +0000 (07:10 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 19 Aug 2010 05:10:35 +0000 (07:10 +0200)

Trivial merge