# HG changeset patch
# User Chris Cannam
# Date 1412779128 -3600
# Node ID eb0f3a2029b8c9c700dad318ba7f4234167a2f6e
# Parent  5be4995f4029aef64897dc49cce9691f84c73571# Parent  5200446bbc6b9c1a4df1a33c2c7775474cc463df
Merge from test-reorg branch