Merge addon-common module loading code to fix Minefield.

--HG--
extra : rebase_source : 6b5f0dc0a575a6d21892e18cbb56ab0230382356

common/modules/bookmarkcache.jsm

@@ -4,11 +4,10 @@
 // given in the LICENSE.txt file included with this file.
 /* use strict */
 
-Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("bookmarkcache", {
     exports: ["Bookmark", "BookmarkCache", "Keyword", "bookmarkcache"],
     require: ["services", "util"]
-}, this);
+});
 
 this.lazyRequire("storage", ["storage"]);