[Box Backup-dev] Merging to trunk

[Ben Summers]

On Thu, 30 Aug 2007, Martin Ebourne wrote:

> Given that Chris is nearly done with his Windows changes it probably
> makes sense to merge them all to trunk (or replace trunk with Chris's
> merge tree).
>
> That will encourage more people to test it which can only be good.

A++++ would merge again !!!111eleven!!

I think a few things have happened in trunk since Chris forked. I  
suggest merging those into Chris' branch, then replacing it.

Some great work there from Chris. It's kind of like he's taken over.  
Which is good! :-)

Ben