Merge proposals dependent on lp://staging/~ubuntu-mozilla-daily/firefox/firefox-3.6.head.daily

1. firefox-3.6.head.daily
2. Dependent merge proposals