We are planning for a Firefox 2.0, but will divide the planned work over (at this point) three major Milestones, 1.1 (July 2005), 1.5 (unscheduled) and 2.0 (unscheduled). All major development work will be done on the Mozilla trunk, and these releases will coincide with Gecko version revs.