Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 08:20:28 +0000 (10:20 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 08:20:28 +0000 (10:20 +0200)

Trivial merge