CVS changes by user

branch to review (2009-11-10 to 2009-11-17) v220