# HG changeset patch
# User Chris Cannam
# Date 1427109988 0
# Node ID 5c5d4863b42849fdc0e2062858a0c4acc725047b
# Parent  c4898e57eea502546201700e773585e157641611# Parent  0559f25b99f2208ffb9ebb74ed173d3ec66f0e41
Merge from cxx11 branch