# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1298604855 0
# Node ID 89a27068b0fa7318086fe4b5373199c83a7ce48d
# Parent  9a12fc2baa37d03869b1c70dfc3d549ad503b19b# Parent  1674cd17557c416dd8c4f2c79e6bcaca7a19d26b
Merge 0.8->trunk