# HG changeset patch
# User Chris Cannam
# Date 1298393295 0
# Node ID 7cec015f07ce4a03f4928f1dcf11dc26da6369ac
# Parent  61f66ddb0b65f2de83944deea4f34c3607c1e1d5# Parent  83bf35c4f9d1ec4531adf7552c1c97892b3460b0
Merge from branch "live"