merge trunk to branch
authorAndreas Müller <a.mueller@bgbm.org>
Tue, 26 Jun 2012 20:12:51 +0000 (20:12 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Tue, 26 Jun 2012 20:12:51 +0000 (20:12 +0000)

Trivial merge