# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1298571605 0
# Node ID c88f646a34d35dcc4dac3d2e3e6381770b29ecfd
# Parent  edd7b0610c2cace9f59b0a1f3051347359d0cbbb# Parent  ffa5384130a7b7ff911bef672720e06ed96aeb92
Merge 0.8->trunk