Merge mozilla-central into mozilla-inbound

This commit is contained in:
Ehsan Akhgari 2012-11-09 12:52:51 -05:00
commit 2c43e3a5ca

Diff Content Not Available