r671 www/trunk