# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1287612402 18000
# Node ID 3cb0559e44d0348493c9f764a4a1e2f552f7fd11
# Parent  469850088fc1fd8c70035d1a1026798b3f7b2dc2# Parent  6bf8d48bec8e1ab2e0462ce14a914d06e64f7117
merge default into stable for 1.7 freeze