merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 21 Jun 2011 17:27:20 -0500
changeset 14714 8deebb577751
parent 14710 640bfe96ddcf (diff)
parent 14713 88a53081fb21 (current diff)
child 14724 b5c60df21b4b
merge with stable