Merge from master to v3-5-test

[Jeremy Allison]

On Fri, Sep 18, 2009 at 01:56:56PM +0200, Karolin Seeger wrote:
> 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, that's fine. Much appreciated !

Jeremy.