Please pull into v3-2-0-stable

[John H Terpstra]

commit f62909d2b457f3494c9536c994a9209f8cc0c331
Author: John H Terpstra <jht at samba.org>
Date:   Thu Jun 19 16:11:31 2008 -0500

    Fixing net help info.

commit a9994d4a18f8130525c56a0a946ad1ff3c11696a
Merge: 8462148... 24730f5...
Author: John H Terpstra <jht at samba.org>
Date:   Thu Jun 19 11:12:17 2008 -0500

    Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test

----------------
Karolin,

I hope this is correct info - I had done a few patches but did not previously 
do a git-push.  I hope this does not mess anything up.

- John T.