# HG changeset patch
# User Chris Cannam
# Date 1383844749 0
# Node ID bffab3762865fe7bea9397d52625318456f62fbd
# Parent  e52de09132b17da988377f07fc2746334aaed5f2# Parent  5e0957fe308dd2db7122debeedac3f57794bc9c4
Merge from luisf branch