r658 www/trunk