RE: Daemon patch

[Robert Collins]

Oh, and sorry for the non-separate changelog, I forgot to separate it out. If you'd 
like that done...let me know.

Rob