just saw the discussion about that (including interview with Merkel) on France Europe Express (TV3).

Montaubourg (socialist) and Barnier (UMP) agreed that a "mini-treaty" (part one and two in the old one) + a couple of amendments should be voted 2008. The method isn't settled but both are more or less for a single European referendum, the same day. This cannot apply to all countries for legal reasons but could be combined with parliamentary votes.