Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit34f23b7ea755eaef6012b653fbcff42714dddcb7
authorJeremy Allison <jra@samba.org>
Fri, 15 Feb 2008 20:39:14 +0000 (15 12:39 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 15 Feb 2008 20:39:14 +0000 (15 12:39 -0800)
treec9f49429ae84cb053768498a663afbdef324aefd
parent0e57795f86fafe541d826deb6d49e77e5644a024
parent55b2292abace1d12b04fb47a61daab26923f887c
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 3957ada4b6aa1f349ac1504125c4013512829ced)