r477 www/trunk