[ros-diffs] [tkreuzer] 48324: reduce diff to trunk