Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 9 Apr 2010 13:36:21 +0000 (15:36 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 9 Apr 2010 13:36:21 +0000 (15:36 +0200)

Trivial merge