Giggs agrees new one-year Man Utd deal