Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 14:34:45 +0000 (15:34 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 14:34:45 +0000 (15:34 +0100)
(This used to be commit 18c683d7e804e76ac37d4069429b5ba1a9d9ae38)


Trivial merge