# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1240519194 18000
# Node ID 0f505bc1c3c3d3f036d8d144aa02e9eed1ed3562
# Parent  fca0b16c594ae1abc8ef6349dbeb0050e7c912ce# Parent  1467705473d5fa1fbe02b5efca603ac8750246ef
Merge with stable