# HG changeset patch
# User Chris Cannam
# Date 1342009813 -3600
# Node ID d36724ef856a3db557e01d5172eddc5861421fc0
# Parent  9ee5fd0b9bd3613986af6cdabf42ac1408cf1f53# Parent  ec1c49528f3655d45bb7f58dc8a77c2bc4886a2c
Merge from branch "cannam_integration"