Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Thu, 24 Jan 2008 21:00:07 +0000 (22:00 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 24 Jan 2008 21:00:07 +0000 (22:00 +0100)
commit52bc292f580a20f83a5d6c29a905c829331f6442
tree6b79adb3f6d33a1b8de72b6962ce65ebfc164d73
parenta2dcf7bd22b5f206ef3c3816d0c93b140260da67
parent43040be5b9c959c2f9c305eec9d66c103edc14af
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit d4d4120b715dc37b708b1c6074eab4f5c23d6b8f)