Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange
authorJelmer Vernooij <jelmer@samba.org>
Wed, 2 Apr 2008 17:02:01 +0000 (19:02 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 2 Apr 2008 17:02:01 +0000 (19:02 +0200)
(This used to be commit 2763fc6294aa35018d4317dd9eebcba969e70333)


Trivial merge