CVS changes by user

review to branch (2009-05-19 to 2009-05-26) v207