# HG changeset patch
# User Chris Cannam
# Date 1322064697 0
# Node ID 6973eeea55acb194085b401c571ffeff7372521d
# Parent  d338e072b97b669ceaee22bbc6b1d3d719618a15# Parent  f3c3a1c55451d6aaa6314347fdb9be9c4e6d3d7c
Merge from branch "luisf"