Merge remote branch 'origin/terencehill/misc_bugfixes'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 5 Jul 2010 06:07:14 +0000 (08:07 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 5 Jul 2010 06:07:14 +0000 (08:07 +0200)

Trivial merge