CVS changes by file

review to branch (2010-01-04 to 2010-01-05) v222