# HG changeset patch
# User Chris Cannam
# Date 1374146412 -3600
# Node ID a48be8a8bcbada2ec3d66f71fbddf9bedf7a1eb1
# Parent  b8f94812d73774b6a364f94f54646f28b60e2d84# Parent  25603efa57b54184a7a8aec370df0d98adaf3acb
Merge from default branch