CVS changes by user

branch to review (2009-08-04 to 2009-08-10) v212