Merge mozilla-central into birch

toolkit/content/PopupNotifications.jsm

@@ -607,6 +607,9 @@ PopupNotifications.prototype = {
       }
     }, this);
 
+    while (this.panel.lastChild)
+      this.panel.removeChild(this.panel.lastChild);
+
     this._update();
   },
 

tools/profiler/TableTicker.cpp

@@ -513,7 +513,7 @@ void TableTicker::doBacktrace(ThreadProfile &aProfile, TickSample* aSample)
   nsresult rv = NS_StackWalk(StackWalkCallback, 0, &array, thread);
 #endif
   if (NS_SUCCEEDED(rv)) {
-    aProfile.addTag(ProfileEntry('s', "(root)", 0));
+    aProfile.addTag(ProfileEntry('s', "(root)"));
 
     for (size_t i = array.count; i > 0; --i) {
       aProfile.addTag(ProfileEntry('l', (const char*)array.array[i - 1]));