==== Option 3 ====
* On June 21 we release Firefox 3.6.18 as an (major? minor?) update to BOTH 3.6.17 and 3.5.19 users
==== Option 4 ====
* On June 21, release a "no-change-but-version-bump" FF4.0.2, and prompt FF3.0, 3.5, 3.6 users to upgrade to that instead. This is something we know we can do easily, and is better then creating a "no-change-but-version-bump" FF3.5.20 (which was proposed in emails).