Merge remote-tracking branch 'origin/samual/balancesamual'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 16 Feb 2011 06:35:16 +0000 (07:35 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 16 Feb 2011 06:35:16 +0000 (07:35 +0100)

Trivial merge