Merge branch 'icculus'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 10:30:02 +0000 (12:30 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 10:30:02 +0000 (12:30 +0200)

Trivial merge