# HG changeset patch
# User cl
# Date 1303957246 25200
# Node ID 6cdf9c2f62babc2645cd8991f3bb5fec3a4a0b86
# Parent  82a9022c4f21b1313023c8303b557a17c4106701# Parent  576612237ba6eb6d3b9d6ee0cbf8fda147100100
Merge

diff -r 82a9022c4f21 -r 6cdf9c2f62ba .hgignore
--- a/.hgignore	Mon Apr 25 15:35:54 2011 -0700
+++ b/.hgignore	Wed Apr 27 19:20:46 2011 -0700
@@ -4,3 +4,4 @@
 ^drop_included/
 ^webrev/
 /nbproject/private/
+^.hgtip