Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
commit23d3db0c229fe5e1d69f890d87c2be39b356ffb5
authorGerald (Jerry) Carter <jerry@samba.org>
Fri, 19 Oct 2007 20:54:32 +0000 (19 15:54 -0500)
committerGerald (Jerry) Carter <jerry@samba.org>
Fri, 19 Oct 2007 20:54:32 +0000 (19 15:54 -0500)
treeb59c3371b7118bfec1a194dd632920c8a277d69e
parentaae3d04e30a0e6f21f661da3dc6a2835d31ce964
parent620785df4e57b72471ff0315e22e0d2f28a2b1a5
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test