r609 www/trunk