# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1312883917 -3600
# Node ID a47abc953e456997f72c677b69698b5771b6376b
# Parent  95bbf7849d4030341852b27b0572fc6d229a70e1# Parent  a76abc63257af93369514fa7d5a3dee063ad79fc
Merge from branch feature_36