CVS changes by user

branch to review (2009-06-23 to 2009-06-30) v209