# HG changeset patch
# User Chris Cannam
# Date 1301656916 -3600
# Node ID c2230be27b7e7578d7226a69d976797e29bf961e
# Parent  055518fc4e4cdbd8dc51b0b70bf8e716b82a1c04# Parent  4188c6eaadf7ca41fef8505687db5212b1c01c78
Merge from branch "feature_128"