Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 11 Jan 2008 00:36:05 +0000 (16:36 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 11 Jan 2008 00:36:05 +0000 (16:36 -0800)
commit767e0164adf8803df50b0b7bd8e81d25af72bb78
tree5dc67fd36bc780d57619f41c482d903be04af9b1
parent3caeeaea162e2083a087c242b850c107a3be1bf9
parent3958abffaf2866c69ad9e13ec345364fde5c78bb
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test