Merge branch 'master' into bug1640
authorBernd Blessmann <bibi@online.de>
Wed, 7 Sep 2011 11:35:06 +0000 (13:35 +0200)
committerBernd Blessmann <bibi@online.de>
Wed, 7 Sep 2011 11:35:06 +0000 (13:35 +0200)

Trivial merge