Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 4 Jan 2008 20:59:36 +0000 (12:59 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 4 Jan 2008 20:59:36 +0000 (12:59 -0800)
commit16224e8f4f22a8db0ed278d741a7706967f55335
tree359b4e9b9ddd6eeea96b6df4848529a3e68c0918
parentc4e5a505043965eec77b5bb9bc60957e8f3b97c8
parent18360b852c662d933ceff9854725f878a5de9a7d
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test