Tue, 21 Apr 2009 15:18:54 +0100Merge and fix
Alpar Juttner <alpar@cs.elte.hu> [Tue, 21 Apr 2009 15:18:54 +0100] rev 658
Merge and fix