Merge mozilla-central to autoland r=merge a=merge

browser/locales/en-US/chrome/browser/sanitize.dtd

@@ -15,7 +15,7 @@
      You can set the column width to a value that makes the dialog look visually balanced,
      or at half of the dialog width if unsure. -->
 <!ENTITY sanitizePrefs2.inContent.dialog.width "34em">
-<!ENTITY sanitizePrefs2.inContent.column.width "17em">
+<!ENTITY sanitizePrefs2.inContent.column.width "24em">
 
 <!ENTITY sanitizeDialog2.title         "Clear Recent History">
 <!-- LOCALIZATION NOTE (sanitizeDialog2.width): width of the Clear Recent History dialog -->