r672 www/trunk