# HG changeset patch
# User Chris Cannam
# Date 1386181755 0
# Node ID 42bbc538d983de019ecc59a65495e27161c4c2e4
# Parent  418cd206476984e04b69fdf6b08bc0b42e1e336e# Parent  23ecd10c2eb63af570fdc510c94ae66dd2992e0c
Merge from tonioni branch