r688 www/trunk