# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1292868536 21600
# Node ID b546db00cfd7a43cb383fc3f58f42b4ff3328998
# Parent  537df3bfbaad677326d62e9f914d2fa0e7712f3c# Parent  122f8a5e02dbf3f6b78379916fe96feea54edcd3
merge with i18n