# HG changeset patch
# User Chris Cannam
# Date 1320762040 0
# Node ID 0c23dd3d0b71bfb5bc05a44fdefca08eafa3f3aa
# Parent  2034af722d0286fbad8f256084f490c6c218bfce# Parent  7ded87cc4b80d6a2c1c0e137626f6e5755c6732b
Merge from branch "bug_320"