Merge with stable
authorMatt Mackall <mpm@selenic.com>
Wed, 28 Apr 2010 13:46:38 -0500
changeset 11033 0179840ab0d3
parent 11032 27f98676f11b (current diff)
parent 11031 409c0e4d79e9 (diff)
child 11037 c1c534d62b05
Merge with stable