# HG changeset patch
# User Chris Cannam
# Date 1378543887 -3600
# Node ID 4ae8342d1e3d2260a532cdb1781c10188d4cb463
# Parent  46151fd36a0a7cf8941285b8c8362b8fb84482f6# Parent  4fe004e096810cc4c3df166023ad0172691f03c3
Merge from abstract branch