Merge commit 'samba/v3-2-test' into v3-2-stable
authorGerald (Jerry) Carter <jerry@samba.org>
Tue, 15 Jan 2008 16:47:07 +0000 (10:47 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Tue, 15 Jan 2008 16:47:07 +0000 (10:47 -0600)
(This used to be commit 5a527476a07ea43178dc5afeaf8ad78da8a4080c)


Trivial merge