merge of '166a496479db8302a15b8d67da979a4d5831f049'
[vuplus_openembedded] / packages / telepathy / empathy-0.5 / .mtn2git_empty