# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1311600217 -3600
# Node ID 0b6c82dead2888a7202f142dca1eac79853ae9c6
# Parent  f7c525dc7585f133ffb81854fb1133760b66e5b7# Parent  a2192366d309c34d7f1199b0d7cbe4a41088fe4c
Merge from branch "cannam"