Merge remote branch 'origin/samual/samualbalance'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 06:36:48 +0000 (07:36 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 06:36:48 +0000 (07:36 +0100)

Trivial merge