# HG changeset patch
# User Chris Cannam
# Date 1331564320 0
# Node ID e40e3ebe9f2e95fccb745aba74087c73619cfb07
# Parent  9f91d1b2ed51857c565bae86fa198301f9d3399a# Parent  f3a61f28896ef7f56fa2eba1f56b75038dd9d81b
Merge from default branch