Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into cprovision
authorJelmer Vernooij <jelmer@samba.org>
Thu, 10 Apr 2008 03:25:18 +0000 (05:25 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 10 Apr 2008 03:25:18 +0000 (05:25 +0200)
(This used to be commit 3522c7e2cf8c6d6129d941a08adcbe2ecbe0758d)


Trivial merge