r663 www/trunk