Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit5df1d8d550d66b1e52219bd15d24af5146c55ceb
authorJeremy Allison <jra@samba.org>
Thu, 21 Feb 2008 19:03:35 +0000 (21 11:03 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 21 Feb 2008 19:03:35 +0000 (21 11:03 -0800)
tree7d8398a2861e2736666d21273df6c17ac7c4bb57
parent3a376f1cfa25f79eab8f41a42383f1bd982830ff
parent7428f00d22ea0b006fd2c69d6533b534f8e41381
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 9dabde1f3e5ba3d98e4e02d8c2a0706dc4f48c18)