# HG changeset patch
# User Chris Cannam
# Date 1386181793 0
# Node ID 8593a3fe50ace3c509f1cc5331c98af289c5de80
# Parent  23ecd10c2eb63af570fdc510c94ae66dd2992e0c# Parent  42bbc538d983de019ecc59a65495e27161c4c2e4
Merge from branch "tonioni_multi_transform"