[ros-diffs] [gvg] 16436: Sync to Wine-20050628: