Merge with stable
authorMatt Mackall <mpm@selenic.com>
Thu, 23 Apr 2009 15:39:54 -0500
changeset 8130 0f505bc1c3c3
parent 8129 fca0b16c594a (current diff)
parent 8128 1467705473d5 (diff)
child 8131 b0d945b95105
Merge with stable