Merge pull request #10471 from masap/20130619

Bug 884565 - [WiFi] Fix WPS regression by Bug 879193, r=kaze(cherry picked from commit 6b78f5678ff88eae580500448a8f374958dc2523)
Merge pull request #10473 from mschwart/bug884486

Bug 884486 Stored MCC matches nsIDOMMozMobileNetworkInfo r=daleharvey(cherry picked from commit 56c50dd7b322a95a29882526eb00c9e261e43032)
Merge pull request #10501 from crdlc/bug-884728

Bug 884728 - [Facebook] Linking feature is broken deleting all local inf...(cherry picked from commit 427e0100826c677cee1341c4d83793321f16bb5f)
Merge pull request #10579 from EverythingMe/bugfix-helper-title

[Bug 886324] Fix helper's title not showing properly [r=crdlc](cherry picked from commit 6b399c122c87ab1bfd9188c80ff6f02f083c9eea)
Merge pull request #10550 from flodolo/bug886028

Bug 886028 - Fix localizability of "All-day Events" label in Calendar(cherry picked from commit 14367fe868af13c63548d57fd1e2dea0134e65fa)
Merge pull request #10619 from asutherland/email-contact-cache-hit-fix

Bug 882916 - [Email] Forward/Reply/Reply All functionality breaks on structured clone failure when e-mail sender already exists and has been cached. r=lightsofapollo(cherry picked from commit 4fafcace2ad0063a2f7125c57374d3985a4ba7fa)
Merge pull request #10575 from jaoo/883965

Bug 883965 - [Settings] Show the authentication type setting correctly, r=kaze(cherry picked from commit 81bbb91bb690cbe4052f33fca9b57186816b28ef)
Merge pull request #10339 from frsela/STK/Bug874308

Bug 874308 - [Buri][GCF][STK]case 27.22.4.9.2/1 (SELECT ITEM, next action indicator, successful) failed(cherry picked from commit 895b29720949517187f0e8451fa205c6c4b5b232)
Merge pull request #10609 from lissyx/bug883781

Bug 883781 - Ensure that setOptions() and click event do not race, r=RudyLu(cherry picked from commit 128024f0923bfa39fe626f55d4f464be8c9557fc)
Merge pull request #9763 from fzzzy/master

bug 865276 Remove old version of maps from repo; The latest version should be added as a custom app in the distribution file created for a specific release
r=julien(cherry picked from commit 4313facec01e6ed307fcb126efbba76367bee9b4)
Merge pull request #10650 from borjasalguero/regression_counter

Bug 887615 - [SMS] [Regression] Character counter is broken. r=schung(cherry picked from commit aa896d36fba7290242ecd82f3f5c1f982a4f268a)
Merge pull request #10641 from steveck-chung/MMS-Delivery-Report

Bug 883095 - [SMS] Delivery Report does not work(cherry picked from commit 40a45fcd773a05e4e6fec517b43f0fdc7f664525)
Merge pull request #10578 from lodr/bug-880395-phantom-usage-sms

Bug 880395 - Check threadId for sending messages before adding them to the current thread.
r=borjasalguero(cherry picked from commit eaa34fef8cc52d70ce0e03e356a2d8f500036ae0)
Merge pull request #10653 from etiennesegonzac/bug-883124-aiplane-gecko-off-sim-pin

Bug 883124 - If we prevented the sim pin dialog from showing while on a call, display it once the call screen closes.(cherry picked from commit 979277a4b22996c95d228390a6803259f84cb182)
Merge pull request #10523 from mozshiao9/master_video_885229

Bug 885229 - [Video] headphoneschange event for videos playing from gall..., r=dkuo(cherry picked from commit dacf6cc28bb5063650f24cd4767653f1aa5c742d)
Merge pull request #10584 from rwldrn/885274

Bug 885274 - [SMS/MMS] Option menu. Only execute menu operations when target has an associated action(cherry picked from commit ccd40132c2d5af6d34da1a5295f9c8f7901a6306)
Merge pull request #10214 from frsela/STK/Bug847057

Bug 847057 [Buri][STK]No information to user when "alpha ID" is absent or empty within send sms/ send ss/ send ussd/ set up call proactive command, r=timdream(cherry picked from commit 4dcf0a83e9328115b172b67f742149cc8b0ff8ec)
Merge pull request #10631 from frsela/STK/Bug886812

Bug 886812 - [STK] Opening settings only for some commands, r=timdream(cherry picked from commit e8191bf269b90480fe69b68f63a16a79f13dfcd7)
Merge pull request #10655 from borjasalguero/weird_sound

Bug 887158 - [SMS] DOMRequest change to an array of [DOMRequest]. r=steveck-chung(cherry picked from commit 8162952be9d4577f58a6815c92c4e51e5e132d85)
Merge pull request #10636 from gtorodelvalle/dialer-bug-884725-facebook-synch-error

Bug 884725 - [Facebook] When clicking on facebook sync error notification, Dialer App. disappears after opening (r=jmcanterafonseca)(cherry picked from commit cca45bb36d8b579958520981f224de75c75283e4)