Merge branch 'master' into divVerent/courtfun2
authorRudolf Polzer <divverent@alientrap.org>
Sun, 12 Sep 2010 14:40:29 +0000 (16:40 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 12 Sep 2010 14:40:29 +0000 (16:40 +0200)

Trivial merge