# HG changeset patch
# User Chris Cannam
# Date 1399472263 -3600
# Node ID 1f94f3776158a22edad40124d865a4ec7d11e59d
# Parent  16c48a3db2a71eca4f0907637bbcb5d0da3644d2# Parent  5821b64c6b26814ec0ae148747e6476ca42ec2c6
Merge from 898:5821b64c6b26