r657 www/trunk