Updated
Created attachment 117349 [details, diff] diff to updated file
Fixed in CVS, thanks for the patch. Please be more careful while updating, you missed a number of things.