# HG changeset patch
# User Chris Cannam
# Date 1305025204 -3600
# Node ID 19549b0c417a3ad8ecc7f81d5f040c872395b612
# Parent  6b3e9f512761ac5152015fe7e123419c87dc9d6e# Parent  a9921f3e908861f9d973b1b73be1f0fccf3fcf76
Merge from branch bug_133