# HG changeset patch
# User Chris Cannam
# Date 1404318681 -3600
# Node ID 178ffa964096f32ace219b21e0fb2e7e71bde1a2
# Parent  f960d67ce84237be28902f24d5c757a72dc8004b# Parent  0009b2b066e0276e892e4e0c2e2a4f2876d5f3ac
Merge from default branch