# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1318254948 18000
# Node ID d4b3b8370b3c9ef8292cab174a6fcb5e419594a8
# Parent  5061640fe5bc920dcec8d3348d9f43affacdb238# Parent  4244f8f37484b48aa7ee28979c9662e28a0cfd95
Merge queued patches.

Hg: --

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -12,6 +12,7 @@ MANIFEST
 dist
 *.egg-info
 hgsubversion/__version__.py
+nbproject
 .project
 .pydevproject
 .settings