# HG changeset patch
# User cl
# Date 1303957245 25200
# Node ID 02a683859a8a209d3479f31848a61acf0db6c198
# Parent  c8136fd161c83917f87e93b14fa2ba3483f9be83# Parent  9f7c281af543ca0f3a362d2b3ebc8df12f08b282
Merge

diff -r c8136fd161c8 -r 02a683859a8a .hgignore
--- a/.hgignore	Thu Apr 21 15:33:03 2011 -0700
+++ b/.hgignore	Wed Apr 27 19:20:45 2011 -0700
@@ -4,3 +4,4 @@
 ^drop_included/
 ^webrev/
 /nbproject/private/
+^.hgtip