Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 15 Feb 2008 20:39:14 +0000 (12:39 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 15 Feb 2008 20:39:14 +0000 (12:39 -0800)
commit3957ada4b6aa1f349ac1504125c4013512829ced
tree9695ef2ed0375009a0d7ec05a55c849b26b1ce65
parent847874ca757ac8ca32082305c8caed5abc7fed1d
parent943386c5dd601f5c8cf85bfcb08f731dd5a6437d
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test