merge with upstream

merge with upstream

--- a/hgext/hgk.py	Mon Jan 22 20:22:25 2007 -0800
+++ b/hgext/hgk.py	Wed Jan 24 23:06:45 2007 +0100
@@ -71,7 +71,7 @@
     if p1: print "parent %s" % (hg.short(p1.node()))
     if p2: print "parent %s" % (hg.short(p2.node()))
     date = ctx.date()
-    description = ctx.description()
+    description = ctx.description().replace("\0", "")
     lines = description.splitlines()
     if lines and lines[-1].startswith('committer:'):
         committer = lines[-1].split(': ')[1].rstrip()