Merge branch 'master' into bug1640
authorBernd Blessmann <bibi@online.de>
Tue, 6 Sep 2011 09:19:21 +0000 (11:19 +0200)
committerBernd Blessmann <bibi@online.de>
Tue, 6 Sep 2011 09:19:21 +0000 (11:19 +0200)

Trivial merge