Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commitc7f34889591174ae335a37ab62747afab8fc418c
authorJeremy Allison <jra@samba.org>
Sat, 9 Feb 2008 01:00:31 +0000 (8 17:00 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 9 Feb 2008 01:00:31 +0000 (8 17:00 -0800)
tree3dacbead8b7c8425e0e69bcebaa82b810f70976d
parent7a694af2f4581b6ca96745f7b82318cb75d26d6e
parent5da927716a857ce686f3b75476671d32f047d2c0
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 33a9859cbdb0dac035af36aa561b6acb24196c86)