Automated merge with ssh://anarayanan@mozilla.com@hg.mozilla.org/labs/weave

services/sync/modules/engines/forms.js

@@ -245,5 +245,5 @@ FormsTracker.prototype = {
     this._rowCount = stmnt.getInt32(0);
     stmnt.reset();
   }
-}
+};
 FormsTracker.prototype.__proto__ = new Tracker();

services/sync/modules/engines/passwords.js

@@ -43,6 +43,7 @@ Cu.import("resource://weave/async.js");
 Cu.import("resource://weave/engines.js");
 Cu.import("resource://weave/syncCores.js");
 Cu.import("resource://weave/stores.js");
+Cu.import("resource://weave/trackers.js");
 
 Function.prototype.async = Async.sugar;
 
@@ -239,7 +240,8 @@ PasswordTracker.prototype = {
   },
 
   _init: function PasswordTracker__init() {
-    this._log = Log4Moz.Service.getLogger("Service."  this._logName);
+    this._log = Log4Moz.Service.getLogger("Service."  + this._logName);
     this._loginCount = this._loginManager.countLogins("", "", "");
   }
-}
+};
+PasswordTracker.prototype.__proto__ = new Tracker();