Merge commit 'origin/ailmanki/helpchange'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 23 Dec 2010 09:12:10 +0000 (10:12 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 23 Dec 2010 09:12:10 +0000 (10:12 +0100)

Trivial merge