Merge branch 'openchange' of /home/jelmer/samba4 into upstream
authorJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 14:08:20 +0000 (16:08 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 14:08:20 +0000 (16:08 +0200)

Trivial merge