Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Thu, 5 Jun 2008 20:03:17 +0000 (22:03 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 5 Jun 2008 20:03:17 +0000 (22:03 +0200)
(This used to be commit dcdfee611ccc0ae798e3eea2cfdf3c7642dc5677)


Trivial merge