# HG changeset patch
# User Chris Cannam
# Date 1413385787 -3600
# Node ID c1834a31029c14e5bd31556ff4c90e15c6aa5829
# Parent  f4f770b4356b31aaffe6fda8069036259e7df0a3# Parent  3536342ac0885a43c5b4aa72a67f5b4ed1d58359
Merge from branch "jams"