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