Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 15 Sep 2010 10:57:20 +0000 (12:57 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 15 Sep 2010 10:57:20 +0000 (12:57 +0200)

Trivial merge