r661 www/trunk