Stig E Sandø - 2001-02-25

Logged In: YES
user_id=9857

The code has been moved into the same file. this will
hopefully help to merge the code.