CVS changes by user

branch to review (2009-07-07 to 2009-07-15) v210