Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office...
authorSven Donath <lxo@dexo.de>
Thu, 30 Sep 2010 15:04:46 +0000 (17:04 +0200)
committerSven Donath <lxo@dexo.de>
Thu, 30 Sep 2010 15:04:46 +0000 (17:04 +0200)

Trivial merge