CVS changes by user

review to branch (2010-01-12 to 2010-01-19) v223