# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1475249064 -3600
# Node ID 335af74a25b6be9e700d9307fabc1b2dd5372866
# Parent  a23b9f8b4a59d0ab5991df5feb8dd3d287ed0be8# Parent  7b7691b4919772954b107230e9a5f2515115c083
Merge from branch clapack-included