# HG changeset patch
# User Edho Arief <edho@myconan.net>
# Date 1343166984 14400
# Node ID bb6ea516f3122c007debda5659d52b13e79632ac
# Parent  39d983d49349c7ea86a2e298db9d190fbe3b0e55# Parent  7ceaf3cd8eeac1d632463263449080c39ce4534b
Merge commit '61bf33d' into rhel5

diff -r 7ceaf3cd8eea -r bb6ea516f312 rc/hgrc
--- a/rc/hgrc	Tue Jul 24 17:51:52 2012 -0400
+++ b/rc/hgrc	Tue Jul 24 17:56:24 2012 -0400
@@ -10,7 +10,7 @@
 
 [extensions]
 #hgext.convert = 
-progress =
+#progress =
 hgext.bookmarks =
 mq =
 rebase =