# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1274348924 -3600
# Node ID 6c1cfb4cea3cd9e53287119fe28075b576eae99d
# Parent  ca1fe9f74bd07553cd43a00ca57cc80c839bbcae# Parent  21f7a216d95581e5b993774bc08f9a33df1860db
Merge 0.7->trunk