# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1186688110 25200
# Node ID 4f648e95cacabe246a060297b85e2c288713da89
# Parent  3edd6fedc33a4ef6a3c4ec011a5365330dfbd2d1# Parent  1fd3248b8aa4f467fdc41cff25f52696f1859da7
Merge with crew-stable

diff --git a/mercurial/extensions.py b/mercurial/extensions.py