[ros-diffs] [gvg] 12603: Import and merge Wine-20041201