r644 www/trunk