Same for me, we have to go to a unified system. BTW don't commit anything to trunk yet (or use a branch) as we are heading to the first RC next monday :-)