# HG changeset patch
# User Chris Cannam
# Date 1301647065 -3600
# Node ID debf12a566cd242024c18f518d083dd75686b258
# Parent  13147268cd65f729b42b6e45b1086de1d4808e81# Parent  8c804ce943db3932b65032fa9b62d18947de66b2
Merge from branch "feature_123"