r615 www/trunk