CVS changes by user

branch to review (2009-12-01 to 2009-12-09) v221