CVS changes by user

branch to review (2009-10-13 to 2009-10-20) v218