r632 www/trunk