Merge branch 'master' of ssh://git-bblessmann@lx-office.linet-services.de/~/lx-office-erp
authorbernd <bernd@lxbug.(none)>
Tue, 28 Dec 2010 13:56:19 +0000 (14:56 +0100)
committerbernd <bernd@lxbug.(none)>
Tue, 28 Dec 2010 13:56:19 +0000 (14:56 +0100)

Trivial merge