merge with stable
authorMatt Mackall <mpm@selenic.com>
Fri, 01 Jul 2011 13:59:09 -0500
changeset 14828 80112b87fc7f
parent 14823 f5bfb27b64e3 (diff)
parent 14827 24ecdbe7c5c8 (current diff)
child 14834 a2de9da4604d
merge with stable