# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266800806 0
# Node ID 78af99ce9c0798bb03ee924fae5a17cf9982668d
# Parent  0d84e1fcb533c8bf0750a86dc3d57e3a306e13d4# Parent  bd134aa85fa9ccbbc4a00bd403723f143f75e7de
Merge with 0.7