Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Mon, 26 Jul 2010 13:52:20 +0000 (15:52 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 26 Jul 2010 13:52:20 +0000 (15:52 +0200)

Trivial merge