Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp
authorSven Donath <lxo@dexo.de>
Wed, 6 Oct 2010 21:55:00 +0000 (23:55 +0200)
committerSven Donath <lxo@dexo.de>
Wed, 6 Oct 2010 21:55:00 +0000 (23:55 +0200)

Trivial merge