# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1380901424 -3600
# Node ID e3dedded9c4d49951f20e3b431503c8ba847cc05
# Parent  f665f9ce2fd11f633df922f80696182483834989# Parent  58ba20857a5e4e319464cdd389c60b5ea99f7e61
Merge from pvoc branch