Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit3aea92c97f4037deca26bbbe991db022ae47b34c
authorJeremy Allison <jra@samba.org>
Fri, 4 Jan 2008 21:59:52 +0000 (4 13:59 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 4 Jan 2008 21:59:52 +0000 (4 13:59 -0800)
treecbdbde0a021376ef85f9297e1858ef9bb763e352
parent6503c7338e2c46bf3c660759c078ff51835a40e9
parent4aba7475effff485f265fb975cf467fffd6c7db0
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 4e1bf48e7eab927e70fde3408a42c56e06b9b178)