CVS changes by user

branch to review (2009-04-28 to 2009-05-05) v205