# HG changeset patch
# User Chris Cannam
# Date 1353677660 0
# Node ID 3b7e11eaf1ca24da8dd5d4a1afc4d9ee3292b8b5
# Parent  b665182d9dd90f1de04adf414d979e1db65ea516# Parent  0d837624e795a3ff332a32defe623456b0ba51d1
Merge from branch "bug_531"