# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1260364846 0
# Node ID c0da9e7b044783fb5fcc0bb17284b03493159b21
# Parent  1e27e0092f19db3708ea32facd7a927a4db7d983
Merge with 0.6