Merge remote branch 'refs/remotes/origin/fruitiex/glowplant'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 20:50:23 +0000 (22:50 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 20:50:23 +0000 (22:50 +0200)

Trivial merge