Tue, 20 Dec 2011 19:39:29 +0100Merge #432 and #433 to branch 1.2 1.2
Alpar Juttner <alpar@cs.elte.hu> [Tue, 20 Dec 2011 19:39:29 +0100] rev 1117
Merge #432 and #433 to branch 1.2