# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266519650 0
# Node ID 4ddacf58f43d4164e595feb241748c70e32b5d01
# Parent  ef33efdec5bb15070dcda2553bc748d25fd2960e# Parent  82f3820758ede5b0fdbf331d0dbb5b35d624bb08
Merge with 0.7