CVS changes by user

review to branch (2009-10-20 to 2009-10-27) v218