Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Wed, 6 Feb 2008 02:13:33 +0000 (18:13 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 6 Feb 2008 02:13:33 +0000 (18:13 -0800)
commitb3f48266f353fb93fee35bdcadaec3abc0fe0122
treec881e089db81ac6e6faa76e09952c7ad2015ea4a
parent8b3004bcf90587d038f18b31b0133da4b0ad5fc9
parentd3311c5c506af7092ba222cdae7834d7e56ec942
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 7b15c75a6bacf783eb73568ed003e4b16d6ebd68)