CVS changes by user

branch to review (2010-05-25 to 2010-06-01) v233