# HG changeset patch
# User Chris Cannam
# Date 1295878364 0
# Node ID e7c03e1738fbd9a4009b5bc65c589f39039b3577
# Parent  4272e09f4b5fd1bf93eb86fa4b3888e219810c9d# Parent  e47742d68d2d9323d204683ba7e7f3a68949988d
Merge from branch "live"