# HG changeset patch
# User Chris Cannam
# Date 1337708267 -3600
#      Tue May 22 18:37:47 2012 +0100
# Node ID a52873c49ca2239ce1875ead591c116358d14568
# Parent  26e8883683779eb2aaf4b3f98b6574e754c4f826
# Parent  0c9b97b73f4d08345302753e6468364e2bf4d07b
Merge from branch "filterflow-no-alloc"