Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 2 Oct 2009 15:19:55 +0000 (17:19 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 2 Oct 2009 15:19:55 +0000 (17:19 +0200)

Trivial merge