# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1324404650 -3600
# Node ID 02c93d1f00d7d73e2ae46d49ed85e114efc76213
# Parent  89db3f30a5091c0e2fd537597cd6d8ac68fc7829# Parent  a1fd7008a052105a3566e6ac96711c3d010aec99
Merge head merging to branch 1.2