Please pull into v3-2-0-stable

[Karolin Seeger]

John,

On Do, Jun 19, 2008 at 04:55:17 -0500, John H Terpstra wrote:
> 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
> 
> ----------------

I picked up 

-b96c9d54 Fixed publishing date info
-5035311a Added TDB File documentation requested by some users
-3a8ea6be Clarification that hosts resolution is done by winbind...
-2a953d6b Clarification that hosts resolution is done by winbind...

instead of the proposed merge commit.

I think that was your intention, right?

Karolin

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.SerNet.DE, mailto: Info @ SerNet.DE

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 194 bytes
Desc: not available
Url : http://lists.samba.org/archive/samba-technical/attachments/20080623/b3368d31/attachment.bin