# HG changeset patch
# User Chris Cannam
# Date 1297972113 0
# Node ID 61f66ddb0b65f2de83944deea4f34c3607c1e1d5
# Parent  5d6e2819f3dda704bc5309e44f463f19e8d3e474# Parent  497c5985af720d5ed4dc6a55a7d8a1f312c964cd
Merge from branch "live"