# HG changeset patch # User Chris Cannam # Date 1300384119 0 # Node ID 9bafea5ac56f06ca1421c82ac0650e591c99ea08 # Parent 73fb5ef55744c8f1e02d4946f5dacdffda6568d3# Parent f89e50d748ed1eb36fbc63d0eed987b1b7b43354 Merge from branch "feature_93". Fixes #93