Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Sat, 4 Sep 2010 16:41:13 +0000 (18:41 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 4 Sep 2010 16:41:13 +0000 (18:41 +0200)

Trivial merge