[ros-diffs] [cfinck] 28347: Rebranch 0.3.3 from current trunk (better than this merging mess :-)