Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 20:24:44 +0000 (23:24 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 20:24:44 +0000 (23:24 +0300)
(This used to be commit b01f34141509c90b12003786957790866c286cba)


Trivial merge