Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 17 Apr 2008 14:53:36 +0000 (16:53 +0200)
committerAndrew Tridgell <tridge@samba.org>
Thu, 17 Apr 2008 14:53:36 +0000 (16:53 +0200)
commit3180cbbc5b3396da07c325166e472b143b3abe1e
tree4724f6827c9ce4bf73bef5048898d5edc1d5d49c
parentdc74e0fad683cb0ef9ee5996aedadd4c377a0f00
parente0fe8613a3621e7a1e0488f6698db56ef6c67dd9
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit c73a3b837ec16fbb846c6e63a45599fca99b3d0b)