Merge from master to v3-5-test

[Karolin Seeger]

Hi Jeremy,

On Thu, Sep 17, 2009 at 12:38:33PM -0700, Jeremy Allison wrote:
> 	Can you do one final merge over from
> master to v3-5-test please and then we'll ensure
> that we maintain this branch separately going
> forward.

yes, of course.

Currently, I am busy with other stuff, but I will do that
next week. If it has to be done earlier, please let me know.

Thanks,
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: 197 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20090918/b8d99eed/attachment.pgp>