reintegrating branch to trunk
authorAndreas Müller <a.mueller@bgbm.org>
Wed, 30 May 2012 18:53:12 +0000 (18:53 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Wed, 30 May 2012 18:53:12 +0000 (18:53 +0000)

Trivial merge