# HG changeset patch
# User Chris Cannam
# Date 1299251171 0
# Node ID f936ec3cb58a72784924e46a368667d56f7c3091
# Parent  83bf35c4f9d1ec4531adf7552c1c97892b3460b0# Parent  847add61573b92a976e731f149c74eebd6b84896
Merge from branch "feature_80"