r669 www/trunk