Merge branch 'master' of ssh://git-bblessmann@lx-office.linet-services.de/~/lx-office-erp
authorBernd Blessmann <bibi@online.de>
Tue, 28 Dec 2010 16:14:59 +0000 (17:14 +0100)
committerBernd Blessmann <bibi@online.de>
Tue, 28 Dec 2010 16:14:59 +0000 (17:14 +0100)

Trivial merge