merge with stable
authorMatt Mackall <mpm@selenic.com>
Thu, 30 Jun 2011 19:34:09 -0500
changeset 14823 f5bfb27b64e3
parent 14813 53ed7b560564 (diff)
parent 14822 760d2dae4839 (current diff)
child 14828 80112b87fc7f
merge with stable