# HG changeset patch
# User Chris Cannam
# Date 1401790496 -3600
# Node ID 42a5801da931d1c4c3b42aa1d62cd8de7636f5cf
# Parent  4969e7921931e130c6fa819d3fdfa636a32725b7# Parent  e7a3fa8f4eec7c85ab80e5b1ddab1e2a60633c2c
Merge from default branch