Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
commitf14f2a4c43b54dcbdf8d7106be36328ce498393e
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>
Thu, 17 Jan 2008 14:29:52 +0000 (17 09:29 -0500)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Thu, 17 Jan 2008 14:29:52 +0000 (17 09:29 -0500)
treebc8766089445757000258b61081e980e1b92aca3
parent096e40c9169b2121a82c42d3cf31cbfb869603ce
parent03387a0f5886d449eda359a5acecd830f3bd35bc
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 15ef5e4884505bca7990e44200d0235764e9057f)