# HG changeset patch
# User Chris Cannam
# Date 1399460132 -3600
# Node ID df05f855f63b458344bb3fddefe1d93dd64abc66
# Parent  e282930cfca77e244ecd8535d3b748340809aabf# Parent  f7e3c782d7584fca777d9e0abd22381a3f33dcf6
Merge from branch bqvec-openmp