# HG changeset patch
# User Chris Cannam
# Date 1415611206 0
# Node ID 6c08e99ca0f3019133f88c82c4df6d7468e85e69
# Parent  4a5d144bd5d0820a418e64d954d0ea3b0e0eeee4# Parent  d854c72dcaa1f2b4ad2098e0e0ee18e605fed6c4
Merge from default branch