r654 www/trunk