# HG changeset patch
# User Chris Cannam
# Date 1302539237 -3600
# Node ID 0f793aa84f750933b93144002727c4dfeb0b0a9c
# Parent  6627ac1de32be1b44255b3b112ddb0675c6ad5e1# Parent  7ba3ba2a0f633e3a364581950080a6094fc9da70
Merge from branch "feature_135"