Merge remote branch 'origin/terencehill/small_cleanups'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 13 Jan 2011 06:08:38 +0000 (07:08 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 13 Jan 2011 06:08:38 +0000 (07:08 +0100)

Trivial merge