Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Fri, 3 Sep 2010 11:41:53 +0000 (13:41 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 3 Sep 2010 11:41:53 +0000 (13:41 +0200)

Trivial merge