Arne F�rlie - 2002-10-22

Patch against HEAD 22/10-2002