Merge commit 'samba/v3-2-test' into v3-2-stable
authorGerald (Jerry) Carter <jerry@samba.org>
Tue, 15 Jan 2008 13:59:23 +0000 (07:59 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Tue, 15 Jan 2008 13:59:23 +0000 (07:59 -0600)
(This used to be commit 061c90fefef0e6093dfc3912d381cc306549ed4b)


Trivial merge