Merge remote branch 'origin/fruitiex/miscfixes' into fruitiex/ctsfix
authorRudolf Polzer <divverent@alientrap.org>
Fri, 10 Dec 2010 21:51:58 +0000 (22:51 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 10 Dec 2010 21:51:58 +0000 (22:51 +0100)

Trivial merge