# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1328026181 0
# Node ID cbd0b45601057116a24ae8eabe4d76b7cef850cf
# Parent  f3c3a1c55451d6aaa6314347fdb9be9c4e6d3d7c# Parent  7614169e14ed20ff11687f6b5d0aae8d14b79d83
Merge from branch "bug_352"