# HG changeset patch
# User Chris Cannam
# Date 1396960243 -3600
# Node ID 4fa3ea96eb658b440c3f6239f23ddbbf586b91a5
# Parent  9e2d1f6cd43a1b72ef95a0e9275867a26964b257# Parent  384338fa460dac5487c2b08c24b1ee0fc83e9b8f
Merge from branch preshift