# HG changeset patch
# User Chris Cannam
# Date 1302541317 -3600
# Node ID e7c58b88e670e7d831f46647e818c712bbe2ede2
# Parent  0f793aa84f750933b93144002727c4dfeb0b0a9c# Parent  aef15dbf269298f683c7df024feb93351dd521a6
Merge from branch "feature_135"