# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1324403975 -3600
# Node ID fe5718b39fdada6e25b9b38a75635b04dd818c42
# Parent  1754cba0879e6b38549387c2d40737c1a98ac1a2# Parent  7c4ba7daaf5fa14c7f71cdd46397629e1236f977
Merge head merging to branch 1.1