# HG changeset patch
# User Chris Cannam
# Date 1358941582 0
# Node ID d24c22d420eba8944b7c60006eac0b3ddb085779
# Parent  fc5d582a25f94a627aa7f0c92ccb5da3232ffefc# Parent  74ad60b807ae450068dd36365567b2cce6edb8ce
Merge from branch "cannam"