Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into SAMBA_3_2_0
authorJeremy Allison <jra@samba.org>
Thu, 11 Oct 2007 00:56:55 +0000 (17:56 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 11 Oct 2007 00:56:55 +0000 (17:56 -0700)
commit0ec55a246238b6cfb3727942c20cd55a16ab4d4a
tree16d73d30cae3f9f095168c9fd1c16461f34fcb1c
parent81a70d4ac5c3143ff036d8f73979da70132e071e
parente1222ec7ea41091ca2eb51867a940cbbadad9514
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into SAMBA_3_2_0
(This used to be commit 3f1ac564c0ab6d498a47da84b4b5744d8d376f3b)