# HG changeset patch
# User Chris Cannam
# Date 1353519350 0
# Node ID 2cc9845228b369eebc58314ce36acfec29992e4c
# Parent  ab0e59f856ba819d912a2329c2b27c7b66cdc275# Parent  b98e55985cb71e1638b55343a1ccd6581e77601d
Merge from branch "luisf"