Merge with -stable
authorMatt Mackall <mpm@selenic.com>
Sun, 24 May 2009 02:56:03 -0500
changeset 8561 accb1cf85c31
parent 8559 4429751f5da7 (current diff)
parent 8560 107af208ed0b (diff)
child 8562 e3495c399006
Merge with -stable