# HG changeset patch
# User Chris Cannam
# Date 1300369505 0
# Node ID 4373061dd20ee9980b2f0841d2d2afdf4e3193af
# Parent  a52970e7a6e0180b0578fdf5be080a8c1d54bcb5# Parent  368b96a87c432bbc97e4e8525d5de9afd7c6f589
Merge from branch "feature_102"