# HG changeset patch
# User Chris Cannam
# Date 1307363659 -3600
# Node ID 6253d777aa12bb1235c1a6425478336b1c382235
# Parent  dcf38f417f1fc18f17b1b47b7ea99624d1b984d7# Parent  d3faf348b287d9f59f28b231fb3981ca9a38e74f
Merge from branch "cannam-pre-20110113-merge". Includes fix for bug #169.