CVS changes by user

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