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)
commitdcdfee611ccc0ae798e3eea2cfdf3c7642dc5677
tree93ea78d785fc5022b7e880751d5b9ce1f6ad6c68
parent1e6bfb1aa7eba1b92ee4bfb318ba843752a993a9
parentc014ffabc65c30a6b83c8f9f9f9a80bb79333f59
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test