# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1292907920 0
# Node ID e76285349ba326e3599545bf39ee906bd7ea830b
# Parent  e288372dd19f5d4834513125321ed772a2ffb797# Parent  65c666d180964b8557afa317307d60bd2a558c5f
Merge with 0.8