Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
commit5c2d4c76d8b56be92edcee026f2289b8b46a4c27
authorAlexander Bokovoy <ab@altlinux.org>
Mon, 14 Jan 2008 18:40:40 +0000 (14 21:40 +0300)
committerAlexander Bokovoy <ab@altlinux.org>
Mon, 14 Jan 2008 18:40:40 +0000 (14 21:40 +0300)
tree04686724c56a7c25a71d37aad0d115f106036328
parent0afd2153c7649e89d595cb7eff0f7b3c0b56ea15
parent3f081ebeadf30a7943723703ecae479e0412c60c
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test