# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2009-12-29 22:16:25
# Node ID 08c90cb58b04fdedfed1ff0669c54a1aa8967c19
# Parent  5d92fe90be84f5f8967cb9bb3550c9e6f587115f

Merge with stable