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. Cheers, Martin.