Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
commit4c2088b1c5341246d0a80ebd21abe780dd6317ec
authorJeremy Allison <jra@samba.org>
Mon, 5 May 2008 23:29:21 +0000 (5 16:29 -0700)
committerJeremy Allison <jra@samba.org>
Mon, 5 May 2008 23:29:21 +0000 (5 16:29 -0700)
treedb4fdbdc642cf67c80932e85b780d845ac2177a5
parentfbc780b60478bb8b30927beacdf65a9a766b2ca1
parent172334815050273efc0a39452f97c81630382174
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
(This used to be commit bb8f098cdfd902bbb36426df2c4f8532881b3fcd)