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:31 +0000 (02:22 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 28 Feb 2008 10:22:31 +0000 (02:22 -0800)
commit4501e1f3a7053b1b21b196687485c42da7ec4034
tree74d997293b989feb5107c0381be1ea6260811a6b
parent1d940490e815bbdb7e4af23ace05ec9ac8fddae8
parent5764073c0cbf0883b14f686d3f12939e829cc6a5
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 22c38c040c37d1e3922be45f22cfb4e7b733df9b)