# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1328191460 0
# Node ID 4884d821863af7849af6f172336d64b98a0c0ce5
# Parent  2a298083742b7081ba6b1ead85c89b3ffe017343# Parent  a03b3813028aaff94c5bddeb712b00c70e2eaa55
Merge from branch "bug_365"