CVS changes by user

branch to review (2009-09-29 to 2009-10-06) v217