# HG changeset patch
# User Chris Cannam
# Date 1381336660 -3600
# Node ID 5b52161fb03402f7366c5dab3d4752ac807da6d2
# Parent  cd304b50908cb2896b4cad9c33bb9841dba33fcd# Parent  2c723b9f5b87579a3114482b081f103d6506b20a
Merge from luisf branch