Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
commita40f68eac1d421c96fc3e10e5a7494dc2c5a124e
authorAlexander Bokovoy <ab@altlinux.org>
Mon, 14 Jan 2008 19:36:47 +0000 (14 22:36 +0300)
committerAlexander Bokovoy <ab@altlinux.org>
Mon, 14 Jan 2008 19:36:47 +0000 (14 22:36 +0300)
tree04686724c56a7c25a71d37aad0d115f106036328
parent5c2d4c76d8b56be92edcee026f2289b8b46a4c27
parenta861ff20917eeca303e2d36de71cd8614e937d5f
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test