merge with stable
authorMatt Mackall <mpm@selenic.com>
Thu, 12 Aug 2010 18:09:03 -0500
changeset 11832 7fa36341e7a0
parent 11831 00fee6394daf (current diff)
parent 11830 9232488985dc (diff)
child 11833 7c9beccb0533
merge with stable