CVS changes by user

branch to review (2010-03-23 to 2010-03-30) v228