Merge remote branch 'origin/fruitiex/gakarmor'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 18:03:29 +0000 (20:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 18:03:29 +0000 (20:03 +0200)

Trivial merge