Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit976b0ec487720982e456f8c3634be3df64882dae
authorJeremy Allison <jra@samba.org>
Thu, 8 Nov 2007 23:13:41 +0000 (8 15:13 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 8 Nov 2007 23:13:41 +0000 (8 15:13 -0800)
treef7a9883ae8988f42ef98aa612e433e0c9613a03b
parente501c0cd44116ee6e42c14100fea526558c37cb2
parent128fa582a62ad3e145c2bda93e4f939d5f62885f
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit d9335456d23271a4b15b97d24f1b263700a3b9df)