# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 2011-12-20 19:25:40
# Node ID c8fce9beb46a86bccaeebaba6a38c25f017deca5
# Parent  9a716871028e3ccf95f14b603956f1f7ff03892a
# Parent  a1fd7008a052105a3566e6ac96711c3d010aec99

Merge head merging