Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit64d4f290cf0aad962a0a3356473632a58e0e34df
authorJeremy Allison <jra@samba.org>
Thu, 27 Mar 2008 23:48:44 +0000 (27 16:48 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 27 Mar 2008 23:48:44 +0000 (27 16:48 -0700)
tree0c8c7d1d9a3bf6a2eebf9a7504e800871be5e704
parente7b6ea46532a26611dfd9d9e2727d52ba6a9cf50
parent84a079af490cb135dd557091932ea079e1d7ff5b
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test