# HG changeset patch
# User Chris Cannam
# Date 1368284458 -3600
# Node ID 51af10e6cd0d541978c78ee9b8f75813367f0753
# Parent  cd2caf235e1fe1c48426471986cc3d3a12ebbf1c# Parent  77c6a81c577f1b150e703f88ee25bf13adcb6034
Merge from matrix_opaque_immutable branch