# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1242672861 18000
# Node ID 97184c58d0b83365a1b8de7a227e713d230f2dcd
# Parent  d72d1a97408a589d5181a10645789ecfaa05d567# Parent  4c030ada58d2698815bbe85b984747c44a73b7d8
Merge with stable

diff -r d72d1a97408a -r 97184c58d0b8 setup.py