Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divVerent@alientrap.org>
Mon, 13 Sep 2010 09:11:02 +0000 (11:11 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Mon, 13 Sep 2010 09:11:02 +0000 (11:11 +0200)

Trivial merge