Merge from master to v3-5-test

[Karolin Seeger]

Hi,

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.

done.

Cheers,
Karolin

-- 
Samba			http://www.samba.org
SerNet			http://www.sernet.de
sambaXP			http://www.sambaxp.org

-------------- 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/20090930/01764dfd/attachment.pgp>