Merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 31 May 2010 12:57:47 -0500
changeset 11248 102d8eb5c890
parent 11247 fd516380732a (current diff)
parent 11246 8f5ad12db28e (diff)
child 11250 ac6fec2af8c8
Merge with stable