Code review comment for lp:~vrruiz/unity-webapps-yahoomail/fix-1188594

Victor, jenkins seems to be indicating a merge conflict here. Can you try merging trunk into this branch and then pushing it again? hopefully that'll make it work.