Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit319dfbaf1b8d08171731d4575127f4bb5255a229
authorJeremy Allison <jra@samba.org>
Fri, 2 Nov 2007 19:06:15 +0000 (2 12:06 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 2 Nov 2007 19:06:15 +0000 (2 12:06 -0700)
tree789124e37a19136d8428c97dd008466b057164f7
parent619e33248d12e764e902e4fdb5fb223cb9cfea3b
parent95de80218c10a72c7b28541c3c2e475e083b68f1
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test