Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 23 Jul 2009 12:15:14 +0000 (14:15 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 23 Jul 2009 12:15:14 +0000 (14:15 +0200)

Trivial merge