# HG changeset patch
# User Chris Cannam
# Date 1381506164 -3600
# Node ID ea2a09a0fd907be181faf6a8b872f17fb9cf88fe
# Parent  96973aaacd75300b93bbf7c9215da5fd51525d29# Parent  23b4cba01fc1e9702a75691d7c57988558187391
Merge from luisf branch