r664 www/trunk