# HG changeset patch
# User Chris Cannam
# Date 1320751997 0
# Node ID 2034af722d0286fbad8f256084f490c6c218bfce
# Parent  882917cbe8d061b7b5edfe8597f86587cf113806# Parent  496b3cfa2f36bc0bcb3a9af69bae15b877628a21
Merge from branch "feature_318"