Merge remote branch 'origin/savagex/glowplant-gratefix'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 24 Oct 2010 11:52:08 +0000 (13:52 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 24 Oct 2010 11:52:08 +0000 (13:52 +0200)

Trivial merge