Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 28 Feb 2008 10:22:47 +0000 (02:22 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 28 Feb 2008 10:22:47 +0000 (02:22 -0800)
commitac9b5f59a55fc5cf9d3900c4dbeeb92cf07a9d6e
treefc3dd01a11be9bd9364845ad5449c83a5503e9b4
parent4501e1f3a7053b1b21b196687485c42da7ec4034
parent36a566dd33052e06593b55f405170e53421ba80c
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 61b4bc13d0f0cf1cf4139ecdfafc78b9bfff0480)