Bug 813758 - Need additional security checks for the geolocation permission. r=sicking a=blocking-basecamp
Additional patch for Bug 821371 to fix crashes on windows, r=timeless

--HG--
extra : rebase_source : 0addf10c8284e141f1dfa8ae2fac467e5232c4f2
Backing out 8c3bd23a1567 due to X orange. r=me a=me
Merge the last PGO-green inbound changeset to m-c.
Merge m-c to inbound.
Bug 826029 - Assertion in mozPoisonWriteMac due to Mac camera code trying to write a defaults file on exit | Assertion failure: ok, at ../../../xpcom/build/mozPoisonWriteMac.cpp:90. r=ehsan.

--HG--
extra : rebase_source : 511835e6d24a0b58b5c9eb684b258456b7a7019e