Merge remote branch 'origin/samual/samualbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 16:46:59 +0000 (17:46 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 16:46:59 +0000 (17:46 +0100)

Trivial merge