Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 29 Feb 2008 14:56:06 +0000 (06:56 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 29 Feb 2008 14:56:06 +0000 (06:56 -0800)
commitad38725f96c9a285718ea6a515d73508b8db3fca
tree118aae9040f9514bf6f00df993ca91af34d9ffcb
parent6a7b6a1961b2bb74e25b4134422089f16a32cc9e
parentc613bd5d4e34caff88deed13cf82608f894e083c
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit e7406822d32d5b36d3706144efbd1eaa7c44cead)