Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit87456d8eefe630ab6ac685524c4560a71764ea96
authorJeremy Allison <jra@samba.org>
Wed, 9 Jan 2008 06:48:40 +0000 (8 22:48 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 9 Jan 2008 06:48:40 +0000 (8 22:48 -0800)
treeb6c6de8782f21ed0f785267086c7eefce38ae10f
parentdec77b387cd9024eb33bb0617c7543814e9c9212
parent2938e74dea1695c813d6220a839b248dbc3b1d8f
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test