# HG changeset patch
# User Chris Cannam
# Date 1400057887 -3600
# Node ID 2175c2ebd5c6ff89360cd0904ecd46b11914df45
# Parent  68e880e0b85772099d0fad111266141493369cd8# Parent  73c2fd9a7dbed503c376df12ab5f06f9f583edec
Merge from default branch