# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1309210742 18000
# Node ID c64bd320e4f0a0bf36f64292900822e6f1f09a56
# Parent  69021fbf914eb5ff35e6d9f22087003d096a17af# Parent  1e6661e098182cbb8e3cf90c9d77d27d277a2823
merge with stable