[ros-diffs] [gvg] 18331: Sync to Wine-20050930: