Merge branch 'v3-0-stable' into v3-0-test
authorGerald (Jerry) Carter <jerry@samba.org>
Mon, 10 Dec 2007 15:59:46 +0000 (09:59 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Mon, 10 Dec 2007 15:59:46 +0000 (09:59 -0600)

Trivial merge