Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
commitd7a406eaa78273e0efa0ce71a9ced5f06e537aab
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)
tree49f405f43e5297a2f3ea52c633ff1bcecdf282c6
parent978eb313448fe9612db5491385a91dd3b67d0e97
parentd35bda0ffd5bea57087dba9a6da8c20df8fa165c
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 5c2d4c76d8b56be92edcee026f2289b8b46a4c27)