Merge remote branch 'origin/tzork/glowplant'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 16:17:52 +0000 (17:17 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 16:17:52 +0000 (17:17 +0100)

Trivial merge