# HG changeset patch
# User Chris Cannam
# Date 1300366292 0
# Node ID f08ecba0f17ba2d9cc54a4ccc181723b54961bb9
# Parent  383223b1dd345754f676586fb27ed8e1b7352a11# Parent  93feb59187f5be16230ffdbd5d095f801eda6e0b
Merge from branch "feature_104"