# HG changeset patch # User Alpar Juttner # Date 2011-12-20 19:10:50 # Node ID 02c93d1f00d7d73e2ae46d49ed85e114efc76213 # Parent 89db3f30a5091c0e2fd537597cd6d8ac68fc7829 # Parent a1fd7008a052105a3566e6ac96711c3d010aec99 Merge head merging to branch 1.2