Merge with stable
authorMatt Mackall <mpm@selenic.com>
Sun, 26 Apr 2009 16:50:09 -0500
changeset 8178 7b861e5167d0
parent 8176 2660e7002413 (current diff)
parent 8177 c8c231da59c3 (diff)
child 8179 0f3b8404051b
Merge with stable