Merge commit 'f7ab33eadcfcf81a67c91ae0c291f07d63b553c6' into t/Kolab_Server/HK/GW...
authorGunnar Wrobel <p@rdus.de>
Thu, 12 Mar 2009 17:47:35 +0000 (17:47 +0000)
committerGunnar Wrobel <p@rdus.de>
Thu, 12 Mar 2009 17:47:35 +0000 (17:47 +0000)

Trivial merge