# HG changeset patch
# User Chris Cannam
# Date 1330362527 0
# Node ID 95877ad67d3e48a2d38f4287d4e1802ee9d00a23
# Parent  9c8147c9f245e74569efa8c77984e76f88f2ac0e# Parent  d932ce55c364b49393997bda1ffd1df7ad7518da
Merge from branch "find"