Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorGerald (Jerry) Carter <jerry@samba.org>
Fri, 19 Oct 2007 20:54:32 +0000 (15:54 -0500)
committerGerald (Jerry) Carter <jerry@samba.org>
Fri, 19 Oct 2007 20:54:32 +0000 (15:54 -0500)
commitbffd56939233ed0168c687118411be631cd30244
treee6e68359e2f61d49a4b0b68db094373a42d33cf4
parent23f6c371c992de211e10b7ae9cd46de3ec672143
parent80b7bcb5fbc98964014b5c8082a626aef24c5feb
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 23d3db0c229fe5e1d69f890d87c2be39b356ffb5)