# HG changeset patch
# User Chris Cannam
# Date 1350654473 -3600
# Node ID 710921c48f062a85505c6da37b1c24da08f01cc5
# Parent  6b978669cdac40fd42652859e01a3ae493ed1c64# Parent  b80f97c892bc45cd0a4619b0f280a0c60d24089d
Merge from branch "cannam"