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)
commite87f4016fbce09fc32b3b7ca18b78f364ad6ee6f
tree746862ea93dc5d632b73ad4e5148a261ae110a88
parent4aa816112a8b9f2d2959c92cfaa2f2954bdeceb2
parent7b9e6d68fbedc342504cf2f70a4ee5ed04e085a2
Merge branch 'master' into bug1640