# HG changeset patch
# User Chris Cannam
# Date 1342009994 -3600
# Node ID fe0249c097f6f3a357c26f48c8fb5fd4c15dffd7
# Parent  ad295b270cd42713e0bdc68ae65a6962a4b953d5# Parent  1a46b2c6da284a90b4eea12a3311c3623c64c812
Merge from the default branch