Merge remote branch 'origin/fruitiex/jumppadlod'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 1 Nov 2010 21:14:48 +0000 (22:14 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 1 Nov 2010 21:14:48 +0000 (22:14 +0100)

Trivial merge