Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sat, 29 Mar 2008 00:31:33 +0000 (17:31 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 29 Mar 2008 00:31:33 +0000 (17:31 -0700)
commitfba9aa4ecf39eee157f5a24e3bc58b68809f092d
tree7439d9e1982fad473330ac0762e2560a2fea143e
parente00bfc509219cce65168f9ef4532eeff09e6f5fb
parent9e328fe94281a0ac35d3fd2117f55aaf329e3972
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 985bd1e642b6e54f1bc95cd4cfcceb96107e383d)