# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1277239513 18000
# Node ID 2186124f08e4789b4eb45617e7efee19ff790b34
# Parent  0d548beb9bca626d27ab76c943df6523383d6c0d# Parent  8b452fe4bf506a1a08bbc7e1bac81aceda8f4d10
Merge with default, fix up stray topological head from i18n