# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1343932889 -3600
# Node ID 64d990177cdaddc5f5d34c90ab306ce8ba143e03
# Parent  03975ec7378dbb0034215fe2d5f1cf66d03592b3# Parent  ebfda4c68b7a510f7e16a40e59b8937da1609932
Merge (Bug #505 fix).