# HG changeset patch
# User mpm@selenic.com
# Date 1121907629 18000
# Node ID d2422f10c136ca37bdddc19e519189a4036dd6e6
# Parent  e5b39ce2c3c98accc12b5de060bce234b3c6f0c8# Parent  36edb39e8e8cc8034d242f31784be727b4322eeb
Merge from BOS

manifest hash: 2276dbd96bb4221e579c871a1de2403c92c85659


diff --git a/.hgignore b/.hgignore
diff --git a/MANIFEST.in b/MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,7 @@ include tests/README tests/run-tests tes
 include *.txt
 include templates/map templates/map-*[a-z]
 include templates/*.tmpl
-include doc/README doc/*.txt
+include doc/README doc/*.txt Makefile
 recursive-include contrib *
 include README
 include CONTRIBUTORS
diff --git a/contrib/hgit b/contrib/hgit
diff --git a/doc/FAQ.txt b/doc/FAQ.txt
diff --git a/doc/hg.1.txt b/doc/hg.1.txt
diff --git a/mercurial/commands.py b/mercurial/commands.py
diff --git a/mercurial/hg.py b/mercurial/hg.py
diff --git a/mercurial/util.py b/mercurial/util.py
diff --git a/templates/map b/templates/map
diff --git a/tests/test-help.out b/tests/test-help.out