Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorAlexander Bokovoy <ab@altlinux.org>
Mon, 14 Jan 2008 18:40:40 +0000 (21:40 +0300)
committerAlexander Bokovoy <ab@altlinux.org>
Mon, 14 Jan 2008 18:40:40 +0000 (21:40 +0300)
(This used to be commit 5c2d4c76d8b56be92edcee026f2289b8b46a4c27)


Trivial merge