Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp release-2.6.1beta1
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 8 Mar 2010 12:34:54 +0000 (13:34 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 8 Mar 2010 12:34:54 +0000 (13:34 +0100)

Trivial merge