Merge branch 'master' into refactor-Kolab_Session
authorGunnar Wrobel <p@rdus.de>
Fri, 23 Oct 2009 17:10:08 +0000 (19:10 +0200)
committerGunnar Wrobel <p@rdus.de>
Fri, 23 Oct 2009 17:10:08 +0000 (19:10 +0200)

Trivial merge