Thu, 09 Oct 2008 16:20:37 +0100Merge
Alpar Juttner <alpar@cs.elte.hu> [Thu, 09 Oct 2008 16:20:37 +0100] rev 324
Merge

Thu, 09 Oct 2008 21:06:43 +0200Fix erroneous merge 1.0
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 09 Oct 2008 21:06:43 +0200] rev 323
Fix erroneous merge