Merge commit 'refs/remotes/origin/t/Kolab_Server/HK/GW/InitialImport' into HEAD
authorGunnar Wrobel <p@rdus.de>
Wed, 11 Mar 2009 13:59:19 +0000 (14:59 +0100)
committerGunnar Wrobel <p@rdus.de>
Wed, 11 Mar 2009 13:59:19 +0000 (14:59 +0100)

Trivial merge