Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorGerald (Jerry) Carter <jerry@samba.org>
Fri, 2 Nov 2007 01:30:43 +0000 (21:30 -0400)
committerGerald (Jerry) Carter <jerry@samba.org>
Fri, 2 Nov 2007 01:30:43 +0000 (21:30 -0400)
(This used to be commit 779353b86d1699324149896f1ffa237c6ebe46ec)

1  2 
source3/param/loadparm.c

Simple merge