# HG changeset patch
# User Chris Cannam
# Date 1296649107 0
# Node ID 97d27ad3df50662e2cd0a6407986bebf88101ef6
# Parent  1ca23eedd5872a088ae5691f034aaa90f17b3df1# Parent  ccfa5126279e9ed4761e6d67ce9648e030e2f4e8
Merge from branch "feature_75".  Should have merged 5 commits ago.  Oops