# HG changeset patch
# User Chris Cannam
# Date 1429518068 -3600
# Node ID 12d982e52190ded18b3b3560ea7f2883ef8667fb
# Parent  9876a1db566c30398da9c1d751eadbbbee10d495# Parent  b36042cb972a7c857b556517b11ba1088cd13b2f
Merge from branch tonioni