# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1254519464 -3600
# Node ID 57446ab8806f32bc824494dd9674d240d667b79e
# Parent  388b125b784a5485effcb49d3e17fed2004eb2b7# Parent  cc7f212b2c48c7837d17ca808cf9b4bde42cba22
Merge with 0.5