# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1302904017 -3600
# Node ID 0c525524f2dcaec7082d7d9df4bb5dc95ba881d7
# Parent  210639fb8fbee1d28194466b5912fd76f0528d82# Parent  aa905291a66c7d8168b1cb912bb173e6478dac05
Merge 0.8->trunk