# HG changeset patch
# User Chris Cannam
# Date 1299254650 0
# Node ID 7b74f431bdab7acc1476baa008e1a788683d9750
# Parent  f936ec3cb58a72784924e46a368667d56f7c3091# Parent  797be8798817c178af2756894b3e349eddf32fa5
Merge from branch "feature_80"