Merge m-c to inbound.

browser/app/blocklist.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1358464191000">
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1358893928000">
   <emItems>
       <emItem  blockID="i58" id="webmaster@buzzzzvideos.info">
                         <versionRange  minVersion="0" maxVersion="*">
@@ -214,6 +214,10 @@
                           </targetApplication>
                     </versionRange>
                   </emItem>
+      <emItem  blockID="i256" id="/^[0-9a-f]+@[0-9a-f]+\.info/">
+                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+                    </versionRange>
+                  </emItem>
       <emItem  blockID="i22" id="ShopperReports@ShopperReports.com">
                         <versionRange  minVersion="3.1.22.0" maxVersion="3.1.22.0">
                     </versionRange>
@@ -226,7 +230,7 @@
                   </emItem>
       <emItem  blockID="i48" id="admin@youtubespeedup.com">
                         </emItem>
-      <emItem  blockID="i109" id="{392e123b-b691-4a5e-b52f-c4c1027e749c}">
+      <emItem  blockID="i104" id="yasd@youasdr3.com">
                         <versionRange  minVersion="0" maxVersion="*">
                     </versionRange>
                   </emItem>
@@ -290,7 +294,7 @@
                         <versionRange  minVersion="0" maxVersion="*">
                     </versionRange>
                   </emItem>
-      <emItem  blockID="i104" id="yasd@youasdr3.com">
+      <emItem  blockID="i109" id="{392e123b-b691-4a5e-b52f-c4c1027e749c}">
                         <versionRange  minVersion="0" maxVersion="*">
                     </versionRange>
                   </emItem>

build/valgrind/cross-architecture.sup

@@ -246,6 +246,22 @@
    fun:_ZN14nsGlobalWindow22GetComputedStyleHelperEP13nsIDOMElementRK18nsAString_internalbPP25nsIDOMCSSStyleDeclaration
    ...
 }
+{
+   Bug 812423
+   Memcheck:Leak
+   fun:malloc
+   fun:_ZN2js15ArgumentsObject6createI18CopyStackFrameArgsEEPS0_P9JSContextN2JS6HandleIP8JSScriptEENS7_IP10JSFunctionEEjRT_
+   fun:_ZN2js15ArgumentsObject14createExpectedEP9JSContextPNS_10StackFrameE
+   ...
+}
+{
+   Bug 812423
+   Memcheck:Leak
+   fun:malloc
+   fun:_ZN2js15ArgumentsObject6createI13CopyFrameArgsEEPS0_P9JSContextN2JS6HandleIP8JSScriptEENS7_IP10JSFunctionEEjRT_
+   fun:_ZN2js15ArgumentsObject14createExpectedEP9JSContextNS_16AbstractFramePtrE
+   ...
+}
 {
    Bug 823782
    Memcheck:Leak

toolkit/mozapps/installer/l10n-repack.py

@@ -112,8 +112,12 @@ def repack(source, l10n, non_resources=[]):
                  for e in entries if isinstance(e, ManifestEntryWithRelPath))
 
     for path in NON_CHROME:
-        for p, f in l10n_finder.find(path):
+        left = set(p for p, f in finder.find(path))
+        right = set(p for p, f in l10n_finder.find(path))
+        for p in right:
             paths[p] = p
+        for p in left - right:
+            paths[p] = None
 
     # Create a new package, with non localized bits coming from the original
     # package, and localized bits coming from the langpack.
@@ -123,19 +127,23 @@ def repack(source, l10n, non_resources=[]):
             # Remove localized manifest entries.
             for e in [e for e in f if e.localized]:
                 f.remove(e)
-        base = mozpack.path.basedir(p, paths.keys())
+        # If the path is one that needs a locale replacement, use the
-        if base:
+        # corresponding file from the langpack.
-            # If the path is one that needs a locale replacement, use the
+        path = None
-            # corresponding file from the langpack.
+        if p in paths:
-            subpath = mozpack.path.relpath(p, base)
+            path = paths[p]
-            path = mozpack.path.normpath(mozpack.path.join(paths[base],
+            if not path:
-                                                           subpath))
+                continue
+        else:
+            base = mozpack.path.basedir(p, paths.keys())
+            if base:
+                subpath = mozpack.path.relpath(p, base)
+                path = mozpack.path.normpath(mozpack.path.join(paths[base],
+                                                               subpath))
+        if path:
             files = [f for p, f in l10n_finder.find(path)]
-            if len(files) == 0 and base in NON_CHROME:
+            if not len(files):
-                path = path.replace(locale, l10n_locale)
+                if base not in NON_CHROME:
-                files = [f for p, f in l10n_finder.find(path)]
-            if len(files) == 0:
-                if not base in NON_CHROME:
                     errors.error("Missing file: %s" % os.path.join(l10n, path))
             else:
                 packager.add(path, files[0])