# HG changeset patch
# User Chris Cannam
# Date 1400057896 -3600
# Node ID 986f1670a5025f9773ec3348a833392b601ae6a0
# Parent  6388ddae6ce3b5ddaeb5a39221e680e0327e55cb# Parent  a964151832a766829dff00b709262910ebac4fcc
Merge from default branch