merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 05 Jul 2011 14:30:53 -0500
changeset 14834 a2de9da4604d
parent 14828 80112b87fc7f (diff)
parent 14833 308e1b5acc87 (current diff)
child 14835 ec4d4114e7fe
merge with stable