Peter Kovacs <kpeter@inf.elte.hu> [Thu, 09 Oct 2008 21:06:43 +0200] rev 329
Fix erroneous merge
Alpar Juttner <alpar@cs.elte.hu> [Thu, 09 Oct 2008 16:42:32 +0100] rev 328
Merge from trunk
Alpar Juttner <alpar@cs.elte.hu> [Thu, 09 Oct 2008 14:37:44 +0100] rev 327
Merge from trunk