Merge remote-tracking branch 'origin/terencehill/misc_bugfixes'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 16 Feb 2011 17:42:50 +0000 (18:42 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 16 Feb 2011 17:42:50 +0000 (18:42 +0100)

Trivial merge