# HG changeset patch
# User Chris Cannam
# Date 1311342144 -3600
# Node ID 7365a0bd7d5ac156b449f278c1d174bd24a773ec
# Parent  682101331278b400507e72520b276a26ce76cb73# Parent  2c4aca969c24955a3a6cc9664eb738b9a3868966
Merge from branch "toggle"