# HG changeset patch
# User asaha
# Date 1304535614 25200
# Node ID 26610bb801518efe1e1d1f1b904f1b035dee006f
# Parent  581dab3f0773fc573542fd739798430c7c643dd4# Parent  6cdf9c2f62babc2645cd8991f3bb5fec3a4a0b86
Merge

diff -r 581dab3f0773 -r 26610bb80151 .hgignore
--- a/.hgignore	Thu Apr 21 16:15:50 2011 -0700
+++ b/.hgignore	Wed May 04 12:00:14 2011 -0700
@@ -4,3 +4,4 @@
 ^drop_included/
 ^webrev/
 /nbproject/private/
+^.hgtip