Merge branch 'release/v3.2.0' master oldarch v4.0.0
authorrautenberg <rautenberg@in-silico.ch>
Thu, 12 Jul 2012 09:11:08 +0000 (11:11 +0200)
committerrautenberg <rautenberg@in-silico.ch>
Thu, 12 Jul 2012 09:11:08 +0000 (11:11 +0200)

Trivial merge