# HG changeset patch
# User Chris Cannam
# Date 1405678071 -3600
# Node ID 681447b0714251b48bcfbe2177a7bda5dd997e0f
# Parent  d8bde801ebd40d722df379eee3b40729d3b78380# Parent  2484e6f95c061639135bbd51998bcaa27281c7c1
Merge from default branch