Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorAlexander Bokovoy <ab@samba.org>
Mon, 21 Apr 2008 07:38:20 +0000 (11:38 +0400)
committerAlexander Bokovoy <ab@samba.org>
Mon, 21 Apr 2008 07:38:20 +0000 (11:38 +0400)
(This used to be commit 2c3ffc1c53550c8e6feeca8fc0270ef9ac1ec70a)


Trivial merge