# HG changeset patch
# User Chris Cannam
# Date 1298023330 0
# Node ID 83bf35c4f9d1ec4531adf7552c1c97892b3460b0
# Parent  497c5985af720d5ed4dc6a55a7d8a1f312c964cd# Parent  4b1a23d816833b62ff51ac4a262921aea85bef69
Merge from branch "bug_83"