[Merge] lp:~om26er/ubuntu/natty/empathy/empathy-fix-769234 into lp:ubuntu/natty/empathy

[Omer Akram]

hmm, I am not sure why is there a very big diff, I only added a patch and changelog entry.
-- 
https://code.launchpad.net/~om26er/ubuntu/natty/empathy/empathy-fix-769234/+merge/60302
Your team Ubuntu Sponsors Team is requested to review the proposed merge of lp:~om26er/ubuntu/natty/empathy/empathy-fix-769234 into lp:ubuntu/natty/empathy.