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 19:36:47 +0000 (22:36 +0300)
committerAlexander Bokovoy <ab@altlinux.org>
Mon, 14 Jan 2008 19:36:47 +0000 (22:36 +0300)

Trivial merge