# HG changeset patch
# User schien
# Date 1304354205 25200
# Node ID e1b5ef243445bf836d095fd44866e1771ef99374
# Parent  2d68646d98ba27e9176bc3fdcc09a1b748364ebd# Parent  02a683859a8a209d3479f31848a61acf0db6c198
Merge

diff -r 2d68646d98ba -r e1b5ef243445 .hgignore
--- a/.hgignore	Thu Apr 28 17:44:28 2011 -0700
+++ b/.hgignore	Mon May 02 09:36:45 2011 -0700
@@ -4,3 +4,4 @@
 ^drop_included/
 ^webrev/
 /nbproject/private/
+^.hgtip