Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
commitfd03ea4a903b79a0a7894315b3b43fb08108f938
authorAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 20:24:44 +0000 (16 23:24 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 20:24:44 +0000 (16 23:24 +0300)
tree0dbce899aca9e727977b2a0becbcc78c6c2de6a4
parente2ffd5110173c6c7d9c15853646988e536331ed0
parent60c3ec3fca08b7d36df760cd6093adb5a807afa0
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit b01f34141509c90b12003786957790866c286cba)