Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Thu, 14 Jan 2010 16:41:43 +0000 (17:41 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Thu, 14 Jan 2010 16:41:43 +0000 (17:41 +0100)

Trivial merge