merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 27 Jun 2011 11:19:27 -0500
changeset 14747 69021fbf914e
parent 14733 130113308856 (diff)
parent 14746 72e4fcb43227 (current diff)
child 14759 c64bd320e4f0
child 14787 fc3a7a53e7b5
merge with stable