# HG changeset patch
# User Chris Cannam
# Date 1300196734 0
# Node ID 84235bb7011c23ddcd9d0d65730e4de460857afa
# Parent  1d51c9df069ba4df1642e062a6a8c2dcbc25b108# Parent  9c5077177fd22c1ef2bb85c9386ac3bb2150dbd3
Merge from branch "bug_89" (fixes #89)