Merge remote branch 'origin/fruitiex/arenafix'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 20:37:22 +0000 (21:37 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 20:37:22 +0000 (21:37 +0100)

Trivial merge