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)
commitb02735f55360e5a4e02dca40458b48cf057ecd7b
tree1e3a56ac5abdd697546d642ab20299118624bb0c
parent890e057f52343ca24bbc74becb2bd715ac2ba3da
parent62ffcb1aa838fa3d4e266aef02918574bc7ca6be
Merge branch 'master' into bug1640