Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 10 Sep 2010 21:27:32 +0000 (23:27 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 10 Sep 2010 21:27:32 +0000 (23:27 +0200)

Trivial merge