Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorGerald (Jerry) Carter <jerry@samba.org>
Fri, 2 Nov 2007 18:16:40 +0000 (14:16 -0400)
committerGerald (Jerry) Carter <jerry@samba.org>
Fri, 2 Nov 2007 18:16:40 +0000 (14:16 -0400)
(This used to be commit 95de80218c10a72c7b28541c3c2e475e083b68f1)


Trivial merge