Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit779353b86d1699324149896f1ffa237c6ebe46ec
authorGerald (Jerry) Carter <jerry@samba.org>
Fri, 2 Nov 2007 01:30:43 +0000 (1 21:30 -0400)
committerGerald (Jerry) Carter <jerry@samba.org>
Fri, 2 Nov 2007 01:30:43 +0000 (1 21:30 -0400)
treec3c20d58023eb81ec4e13d774ace3ece86ebf0c3
parentd6cdbfd875bb2653e831d314726c3240beb0a96b
parent47dbddcb5361caa30ee60cf4e15bb50d557d1191
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
source/param/loadparm.c