Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Fri, 8 Oct 2010 11:04:34 +0000 (13:04 +0200)
committerJan Büren <jan@lx-office-hosting.de>
Fri, 8 Oct 2010 11:04:34 +0000 (13:04 +0200)

Trivial merge