merge of '05c8f69b2d2ba03b628ce8728fe2137af29844b1'
[vuplus_openembedded] / packages / telepathy / empathy-0.5 / .mtn2git_empty