Merge libmm-fileinfo