Merge remote branch 'origin/divVerent/convert-from-map-to-map'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 10 Oct 2010 14:53:39 +0000 (16:53 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 10 Oct 2010 14:53:39 +0000 (16:53 +0200)

Trivial merge