Thu, 09 Oct 2008 21:06:43 +0200 Peter Kovacs Fix erroneous merge 1.0