r699 www/trunk