# HG changeset patch
# User Chris Cannam
# Date 1413191797 -3600
# Node ID caf05503bf4228cf90e321221c3ef875007818f1
# Parent  565bc0c2295d9582a03db65e3e62960863900898# Parent  c82736e79739f43ddeade2eead4f4857a5038db5
Merge from branch "with-dependencies"