# HG changeset patch
# User Chris Cannam
# Date 1366045386 -3600
# Node ID cf32a7c584c22a5d89916f3af5abb8a82569f6ac
# Parent  7be7b43b72649ec2df324e4c008fd2e012ccd0ad# Parent  ce71d2d9bdb71089346c0aa20b45a0f06ddea1e9
Merge from the default branch