# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1270507728 18000
# Node ID f97b98db6fd1de6c60c1b60254c9240337dadc01
# Parent  30cce7010630cb765e75eacdb838f5da4ad79ef1# Parent  36cec318461233119e4543ed6e542936ddf3c40c
Merge with stable