Merge branch 'master' into icculus
authorRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 20:06:32 +0000 (22:06 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 20:06:32 +0000 (22:06 +0200)

Trivial merge