# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1316448209 -3600
# Node ID b1fa2f0ac9d8cee9732ea65586a62b58fd89b64c
# Parent  76be9c574f4f024359f452ef64230984b4114b77# Parent  0435cf085f2895cd61772e0305cb4fec37e5da9f
Merge from branch feature_36