Merge branch 'v3-2-test-merge' into v3-2-stable
authorGerald W. Carter <jerry@samba.org>
Wed, 16 Jan 2008 16:35:36 +0000 (10:35 -0600)
committerGerald W. Carter <jerry@samba.org>
Wed, 16 Jan 2008 16:35:36 +0000 (10:35 -0600)
(This used to be commit 6993b6139419761c649f3ad54467a2c34f29382d)


Trivial merge