# HG changeset patch
# User Chris Cannam
# Date 1331727290 0
# Node ID 9b300409c184d47d57fba49341b2a1818b7fd0bc
# Parent  f3a61f28896ef7f56fa2eba1f56b75038dd9d81b# Parent  4ed384ea7f392be194f96106d30172f4987857ae
Merge from branch "fswatcher"