# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1293653984 21600
# Node ID 3eee7b42d17e10422fbefe63a04bba2228fe99da
# Parent  91bc001a592fabdf3213c51a236a293037860486# Parent  5d0a30fad7de1c7e75ef9457b77127c97f0c87f7
merge with stable

diff -r 91bc001a592f -r 3eee7b42d17e mercurial/util.py
diff -r 91bc001a592f -r 3eee7b42d17e tests/test-doctest.py