Merge branch 'master' into morphed/narmorx
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Sep 2010 10:00:38 +0000 (12:00 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Sep 2010 10:00:38 +0000 (12:00 +0200)

Trivial merge