# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2010-12-20 21:27:15
# Node ID f16b3b1a223474f4768f72e6bc48683a1881e238
# Parent  2537bd17421d10b0ece2542f6e24c1b9ae68925d
# Parent  f9d29777b4eb88e87c9dca68a55e396ab63d8898

merge with stable