Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commite6fcfdb54eb75d69370d1af276e478b15a15d855
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)
treee59a4dc8eeea6d30d3146940363d65229862d8a2
parentd58398bd2366a7fb4625f2d42dd6f5a5b953d5ca
parent1870643d20423fcc4df5dc62b1ab75f8a5b2b635
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit ec891be53cc4042baf418c1f7b037a11e5055273)