Merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 20 Jul 2009 19:18:38 -0500
changeset 9181 8864112d4f57
parent 9180 efe990445b33 (current diff)
parent 9177 41bc92142f06 (diff)
child 9193 52de439b8d99
Merge with stable