# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1275405127 18000
# Node ID 94b7b3a1ae1bb4344220fa360ca9f1c5c4063f89
# Parent  d50e943a2acff2b1ea0110d309959f617f3b0cb0# Parent  e4dbaa40096d56f7178be7d82fa7b0d728801670
Merge with stable

diff -r d50e943a2acf -r 94b7b3a1ae1b mercurial/hg.py
diff -r d50e943a2acf -r 94b7b3a1ae1b mercurial/util.py