# HG changeset patch
# User Chris Cannam
# Date 1481111642 0
# Node ID 21d6d75c2b51ce3211d9d0eb0b31843e62a28e4c
# Parent  558347e7e1abecf45f6368b4526ff3639c52e8ba# Parent  6f5a40419b00866b3eb5d0105df03126d3f16f92
Merge from branch bqaudioio