CVS changes by user

branch to review (2009-06-09 to 2009-06-16) v208