# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1309546749 18000
# Node ID 80112b87fc7f841baeb1320cd4aa00bbc64a4ba5
# Parent  f5bfb27b64e3b99618b59df7bc60a10e4d86b302# Parent  24ecdbe7c5c80fe24786a71c33e3706ed747ee88
merge with stable