# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1138817895 -3600
# Node ID c21b54f7f7b8871601ba4078ae5d2858940de59d
# Parent  675ca845c2f891b549ef96b12aa30cd7e21f2505# Parent  0690d0f202e1ae27a94ff81c862fd973408481b7
Merge with crew

diff --git a/mercurial/changelog.py b/mercurial/changelog.py
diff --git a/mercurial/filelog.py b/mercurial/filelog.py
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
diff --git a/mercurial/manifest.py b/mercurial/manifest.py
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
diff --git a/mercurial/statichttprepo.py b/mercurial/statichttprepo.py