r648 www/trunk