pidgin: 0a32c8bd: merge of '0394d7df6e47a5fa45b9a961d47614...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 0a32c8bd4cfe8147512e34497e8bee4ad94144a4
Ancestor: 0394d7df6e47a5fa45b9a961d47614562888683e
Ancestor: 6654fd8eb28f8fffb305c9901bfe4185c1b4c883
Author: evands at pidgin.im
Date: 2008-08-23T17:40:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0a32c8bd4cfe8147512e34497e8bee4ad94144a4

Added files:
        pidgin/pixmaps/protocols/16/scalable/google-talk.svg
Modified files:
        libpurple/protocols/jabber/parser.c
        pidgin/pixmaps/emotes/default/24/scalable/pidgin-emotes.svg
        pidgin/pixmaps/protocols/16/aim.png
        pidgin/pixmaps/protocols/16/bonjour.png
        pidgin/pixmaps/protocols/16/gadu-gadu.png
        pidgin/pixmaps/protocols/16/google-talk.png
        pidgin/pixmaps/protocols/16/icq.png
        pidgin/pixmaps/protocols/16/irc.png
        pidgin/pixmaps/protocols/16/meanwhile.png
        pidgin/pixmaps/protocols/16/msn.png
        pidgin/pixmaps/protocols/16/novell.png
        pidgin/pixmaps/protocols/16/qq.png
        pidgin/pixmaps/protocols/16/scalable/aim.svg
        pidgin/pixmaps/protocols/16/scalable/bonjour.svg
        pidgin/pixmaps/protocols/16/scalable/gadu-gadu.svg
        pidgin/pixmaps/protocols/16/scalable/icq.svg
        pidgin/pixmaps/protocols/16/scalable/irc.svg
        pidgin/pixmaps/protocols/16/scalable/meanwhile.svg
        pidgin/pixmaps/protocols/16/scalable/msn.svg
        pidgin/pixmaps/protocols/16/scalable/novell.svg
        pidgin/pixmaps/protocols/16/scalable/qq.svg
        pidgin/pixmaps/protocols/16/scalable/silc.svg
        pidgin/pixmaps/protocols/16/scalable/simple.svg
        pidgin/pixmaps/protocols/16/scalable/yahoo.svg
        pidgin/pixmaps/protocols/16/scalable/zephyr.svg
        pidgin/pixmaps/protocols/16/silc.png
        pidgin/pixmaps/protocols/16/simple.png
        pidgin/pixmaps/protocols/16/yahoo.png
        pidgin/pixmaps/protocols/16/zephyr.png

ChangeLog: 

merge of '0394d7df6e47a5fa45b9a961d47614562888683e'
     and '6654fd8eb28f8fffb305c9901bfe4185c1b4c883'