Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sat, 12 Apr 2008 00:24:31 +0000 (17:24 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 12 Apr 2008 00:24:31 +0000 (17:24 -0700)
commit05c15785d75320749b673a98023b8386b20f23fe
tree4e8decf7675b0adbfe845ee36c6ba9965195d01a
parente76ec752be503338c0a26be34f8d0fb4fbeb5fe6
parent7d7b420ad13c1d6fc89569f1f0dc4df92d8e0c24
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 6a965e72a8650b275222548445d10b65aa61e765)