[ros-diffs] [greatlrd] 25666: merge trunk rev : 25663 and 25664 to 0.3.1 branch - update freetype, take care of a segment fualt I getting in vmware