Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit1de05f1a87fcea598021ca485d3ed87005a3be68
authorJeremy Allison <jra@samba.org>
Tue, 11 Mar 2008 22:26:22 +0000 (11 15:26 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 11 Mar 2008 22:26:22 +0000 (11 15:26 -0700)
treec4825b4b16be80587960183d19a80175391ba6fe
parentc4fa4917dad97c5047f7336c6675739b44da256b
parentc765090871ed68a9ba650bca44f5f3b88997ea14
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test