# HG changeset patch
# User Chris Cannam
# Date 1292517860 0
# Node ID 2248a45897a03363a6946ca0a7802500074dc624
# Parent  98b2834d136b3339d186b0c491cd2658e110275d# Parent  1412841d48a3e70cf3c305550fb8f57ee21a1391
Merge from branch "cannam"