propagate from branch 'im.pidgin.pidgin.2.x.y' (head e5da7785a2652cde78fbe767249021427fb62243)

2012-05-25, Elliott Sales de Andrade