# HG changeset patch
# User schien
# Date 1304354209 25200
# Node ID 66826b0aec5a1834da3821c35cf85ac154e9b04d
# Parent  e3c53d486eec365133234d18b3d73872785c55e1# Parent  6cdf9c2f62babc2645cd8991f3bb5fec3a4a0b86
Merge

diff -r e3c53d486eec -r 66826b0aec5a .hgignore
--- a/.hgignore	Thu Apr 28 17:44:29 2011 -0700
+++ b/.hgignore	Mon May 02 09:36:49 2011 -0700
@@ -4,3 +4,4 @@
 ^drop_included/
 ^webrev/
 /nbproject/private/
+^.hgtip