CVS changes by user

branch to review (2009-12-14 to 2010-01-04) v222