r656 www/trunk