# HG changeset patch
# User Ivan Damnjanovic lnx <ivan.damnjanovic@eecs.qmul.ac.uk>
# Date 1306334077 -3600
# Node ID 6f78b069e541a3d95f4f692cd108b026ea762775
# Parent  9793ce00d72908b6ebdac581c4bc26656f3d2034# Parent  db5a7fe1a4043ec338134816a04e38cadec1d3aa
Merge from branch "ivand_dev" after issues 158, 159, 163 resolved