Dan Pupek - 2005-03-31

I combined patches for two different files in here