# HG changeset patch
# User Chris Cannam
# Date 1299251014 0
# Node ID 1d51c9df069ba4df1642e062a6a8c2dcbc25b108
# Parent  7cec015f07ce4a03f4928f1dcf11dc26da6369ac# Parent  847add61573b92a976e731f149c74eebd6b84896
Merge from branch "feature_80"