Merge branch 'Kolab_Server_Refactoring'
authorGunnar Wrobel <p@rdus.de>
Tue, 20 Oct 2009 07:58:45 +0000 (09:58 +0200)
committerGunnar Wrobel <p@rdus.de>
Tue, 20 Oct 2009 07:58:45 +0000 (09:58 +0200)

Trivial merge