Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
commit09e5c6adde5564afc0d1be25f297fbfd284d559f
authorJelmer Vernooij <jelmer@samba.org>
Sun, 9 Mar 2008 12:51:52 +0000 (9 13:51 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 9 Mar 2008 12:51:52 +0000 (9 13:51 +0100)
tree2bb2d8ef02952ecd5d623cb8310e06c6a102f519
parentc430b7831d5dc6f81cfd18ee2bf24bc3f276fe5d
parentc2401811aa3d02a9e27969687b9ea035407000c3
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test