CVS changes by user

branch to review (2010-05-18 to 2010-05-25) v232