merge of '7131f28196073180061901d8749502f5acea9a0b'
[vuplus_openembedded] / packages / ffmpeg / omapfbplay / .mtn2git_empty