r612 www/trunk