Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorAlexander Bokovoy <ab@samba.org>
Thu, 13 Dec 2007 09:57:24 +0000 (12:57 +0300)
committerAlexander Bokovoy <ab@samba.org>
Thu, 13 Dec 2007 09:57:24 +0000 (12:57 +0300)

Trivial merge