CVS changes by user

branch to review (2010-01-19 to 2010-01-26) v224