Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 02:11:04 +0000 (03:11 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 02:11:04 +0000 (03:11 +0100)
(This used to be commit d4fb8b0d8644cddfa39655fac87a96edc71b2a73)


Trivial merge