# HG changeset patch
# User mikejwre
# Date 1261035579 28800
# Node ID acc1e40a5874ebf32bebcb6ada565b3b40b7461c
# Parent  ceb2857fce7dfd414ae1c425d1370fb433fa1bbe# Parent  3813998729582c17e6a87cfd46068ad722f9233d
Merge

diff -r ceb2857fce7d -r acc1e40a5874 .hgignore
--- a/.hgignore	Tue Dec 08 09:16:34 2009 -0800
+++ b/.hgignore	Wed Dec 16 23:39:39 2009 -0800
@@ -1,3 +1,3 @@
 ^build/
 ^dist/
-^nbproject/private/
+/nbproject/private/