# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1358777849 0
# Node ID 6a10e5fbf8b2dd0abf13cdb065040d29d1db17da
# Parent  3b7e11eaf1ca24da8dd5d4a1afc4d9ee3292b8b5# Parent  a943f341c99d796c7c75ad1d16969ebe5aa2ef7d
Merge from branch "feature_550"