# HG changeset patch
# User Chris Cannam
# Date 1404318708 -3600
# Node ID d8bde801ebd40d722df379eee3b40729d3b78380
# Parent  1162c93e76880751100f7bf42969fa9b5176e13c# Parent  6a84102c006a2bf76774e3f66a8c03a1351e97db
Merge from default branch