33fb4219a011

--- a/.hgrc	Tue Jul 12 11:37:24 2011 -0400
+++ b/.hgrc	Tue Jul 12 17:00:13 2011 -0400
@@ -113,6 +113,9 @@
 mergelocal = !$HG --config ui.merge=internal:local merge $@
 mergeother = !$HG --config ui.merge=internal:other merge $@
 mergefail = !$HG --config ui.merge=internal:fail merge $@
+takelocal = !"$HG" revert --rev 'p1()' $@ && "$HG" resolve -m $@
+takeother = !"$HG" revert --rev 'p2()' $@ && "$HG" resolve -m $@
+
 
 fdiff = diff -U 10000000000000
 qfdiff = qdiff -U 10000000000000

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dotjs/encrypted.google.com.js	Tue Jul 12 17:00:13 2011 -0400
@@ -0,0 +1,1 @@
+google.com.js
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dotjs/google.com.js	Tue Jul 12 17:00:13 2011 -0400
@@ -0,0 +1,18 @@
+$(function() {
+    var css = ".vspib, .vspi {display: none;} #vspb {display: none;}";
+    if (typeof GM_addStyle != "undefined") {
+        GM_addStyle(css);
+    } else if (typeof PRO_addStyle != "undefined") {
+        PRO_addStyle(css);
+    } else if (typeof addStyle != "undefined") {
+        addStyle(css);
+    } else {
+        var heads = document.getElementsByTagName("head");
+        if (heads.length > 0) {
+            var node = document.createElement("style");
+            node.type = "text/css";
+            node.appendChild(document.createTextNode(css));
+            heads[0].appendChild(node); 
+        }
+    }
+})();