Merge with head

services/sync/Weave.js

@@ -51,9 +51,9 @@ WeaveService.prototype = {
     case "app-startup":
       let os = Components.classes["@mozilla.org/observer-service;1"].
         getService(Components.interfaces.nsIObserverService);
-      os.addObserver(this, "profile-after-change", true);
+      os.addObserver(this, "sessionstore-windows-restored", true);
       break;
-    case "profile-after-change":
+    case "sessionstore-windows-restored":
       Components.utils.import("resource://weave/service.js");
       Weave.Service.onStartup();
       break;