# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1328095655 0
# Node ID 567eede6ce10081ee680cde978e348cbea2ba9b1
# Parent  1b3e19345cf5bbea7e165305a7766ea782156942# Parent  b4c5b0dc36c9b1840f9f4eb316ef4691d4e2e5d4
Merge from branch "bug_366"