Merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 08 Jun 2009 18:21:13 -0500
changeset 8755 a2b4ddee3785
parent 8753 af5f099d932b (current diff)
parent 8754 31c90d12f86c (diff)
child 8756 6019e6517f95
Merge with stable