# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1328102445 0
# Node ID 2a298083742b7081ba6b1ead85c89b3ffe017343
# Parent  567eede6ce10081ee680cde978e348cbea2ba9b1# Parent  6e2b4ae0c843bc6900b6ef91c453a1f539c8cc1c
Merge from branch "bug_365"