CVS changes by user

branch to review (2009-09-15 to 2009-09-22) v216