# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1312800732 -3600
# Node ID 95bbf7849d4030341852b27b0572fc6d229a70e1
# Parent  61e0de6cc1bb3464b6f426849e908be62e987412# Parent  82a6e37563832756e9e596174abb868c044d461d
Merge from branch feature_36