# HG changeset patch
# User Chris Cannam
# Date 1404318697 -3600
# Node ID 7b6c5fce5f849472008c5a4a1faf824f7a9ddbdb
# Parent  b68af2be4545adf04eec58c50d8419dc574b8642# Parent  09026c8753016e662cf99c52b9c8163db4d5d41b
Merge from default branch