Merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 21 Apr 2009 12:58:24 -0500
changeset 8106 9269b66fc7e7
parent 8103 2a4a71b15e95 (current diff)
parent 8105 0019be957555 (diff)
child 8129 fca0b16c594a
Merge with stable