r636 www/trunk