diff hgmerge @ 4879:da8640113b5a

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Sat, 14 Jul 2007 13:34:40 -0500
parents e4480f2b61e9
children f53d97d651f4
line wrap: on
line diff