Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commitec891be53cc4042baf418c1f7b037a11e5055273
authorJeremy Allison <jra@samba.org>
Thu, 25 Oct 2007 23:22:40 +0000 (25 16:22 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 25 Oct 2007 23:22:40 +0000 (25 16:22 -0700)
tree9a4c863fdd9d343a25acb983595c72887ed85856
parent9aa9ecd8cc29d055d78f16b8fb2156ec04063c42
parenta68bbea0d42cc64b9fa731ab2a1da82ef30937c6
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test