Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Wed, 9 Jan 2008 22:35:37 +0000 (14:35 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 9 Jan 2008 22:35:37 +0000 (14:35 -0800)
commit92fcf22b79809393c734e4005c34a5e7e4aaa912
tree897cf1ba4b7b8145f2d63fe1c16e449a68216635
parent231a148badf1f9b868ed1d37532020defa27bbd6
parent2a5c53220a5cc2b4a80fc7c6cb38e87789c5e797
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test