Merge branch 'work/v3-2-test' into v3-2-test
authorGerald (Jerry) Carter <jerry@samba.org>
Wed, 2 Jan 2008 23:15:10 +0000 (17:15 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 2 Jan 2008 23:15:10 +0000 (17:15 -0600)
(This used to be commit 761858312b3470ff2acc2980882bad534275c552)


Trivial merge