CVS changes by user

review to branch (2010-06-01 to 2010-06-07) v233