merge of '3a83490f3912de8140c15cfc3041c16cc3cb74f9'
[vuplus_openembedded] / packages / telepathy / empathy-0.5 / .mtn2git_empty