[ros-diffs] [gvg] 17717: Sync to Wine-20050830: