Merge commit 'samba/v3-2-test' into v3-2-stable
authorGerald (Jerry) Carter <jerry@samba.org>
Mon, 14 Jan 2008 21:10:14 +0000 (15:10 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Mon, 14 Jan 2008 21:10:14 +0000 (15:10 -0600)
(This used to be commit bb36b74a4e8fa63672031145b6d39d79468241d9)


Trivial merge