Merge proposals dependent on lp:~micahg/firefox/firefox-3.6.head.daily-patch-rebase-20090910

1. firefox-3.6.head.daily-patch-rebase-20090910
2. Dependent merge proposals