Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commitf98c68a8a4882cb0a1b7e8985f3eba5ebb8287e3
authorJeremy Allison <jra@samba.org>
Thu, 10 Jan 2008 01:08:20 +0000 (9 17:08 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 10 Jan 2008 01:08:20 +0000 (9 17:08 -0800)
tree596aa85e2535b318773b58ec717c0470869f14f7
parentd27e6c0548d21394f6399d3b737d175ffed8420d
parent778199cf00196f81fd96deae1370d8cbc438c5bf
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test