# HG changeset patch
# User Chris Cannam
# Date 1342013759 -3600
# Node ID 9fda6880be8177f114620987911f42185df6017a
# Parent  5d2b359e644d49e66aa7f9f54a10043bd07443ba# Parent  1affbc7f4b30117d2a951fe8777dd4f68d676771
Merge from the default branch