CVS changes by user

branch to review (2009-08-18 to 2009-08-25) v213