# HG changeset patch
# User Chris Cannam
# Date 1328106956 0
# Node ID aa0ad9ab384b5aef48470fda12562d16d962358f
# Parent  6658ebca67e71502c9c0d442f919941dfac6fba1# Parent  83740cd6705e266c8c63bf22b6775bd47e097475
Merge from branch "cannam"