Merge remote branch 'icculus/master'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 18:58:08 +0000 (20:58 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 18:58:08 +0000 (20:58 +0200)

Trivial merge