r695 www/trunk