CVS changes by user

review to branch (2010-02-23 to 2010-03-02) v226