# HG changeset patch
# User Chris Cannam
# Date 1301330483 -3600
# Node ID 766ad4e52e6eecad964197eceaa7f057b6630c0b
# Parent  e6994440b64f12f7e9a29fb01373578f43b389af# Parent  c7d3b58bd01c75550474b1d4d660e6305246017c
Merge from branch "feature_117"