r607 www/trunk