Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit61b4bc13d0f0cf1cf4139ecdfafc78b9bfff0480
authorJeremy Allison <jra@samba.org>
Thu, 28 Feb 2008 10:22:47 +0000 (28 02:22 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 28 Feb 2008 10:22:47 +0000 (28 02:22 -0800)
tree9becf42ec3c2c985caaf9b86e34777434e6ef0d5
parent22c38c040c37d1e3922be45f22cfb4e7b733df9b
parent5c8b57750186ec482bbfbf608157e4f5e3e80cc0
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test