# HG changeset patch
# User Chris Cannam
# Date 1329242139 0
# Node ID dca5bd5b2a065c9b52c1fa627dda8121f5b217c4
# Parent  a4e699d32a9a5c39fabdd58b53a49931517b1b34# Parent  9f91d1b2ed51857c565bae86fa198301f9d3399a
Merge from branch "fswatcher"