# HG changeset patch
# User Chris Cannam
# Date 1374146384 -3600
# Node ID bef3c810b1e47c839182be204d44ed8b9471d16f
# Parent  a6a25685e5a6aaade0c52b7063560abe22dfb30c# Parent  99e0ed523b177fa4a139a4f2f3513330dedc0ed6
Merge from branch luisf