Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorHolger Lindemann <hli@lx-system.de>
Thu, 4 Mar 2010 23:24:48 +0000 (00:24 +0100)
committerHolger Lindemann <hli@lx-system.de>
Thu, 4 Mar 2010 23:24:48 +0000 (00:24 +0100)

Trivial merge