r680 www/trunk