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


Trivial merge