pidgin: fe69dfea: merge of '4c978163a43dcf3f47d33ebb76d86d...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: fe69dfeac6d98c4a6864e937ab3d45f614d43dad
Ancestor: 4c978163a43dcf3f47d33ebb76d86d9be5f52a24
Ancestor: fbc5141857873eae0512b7cecad373ea0612207e
Author: datallah at pidgin.im
Date: 2010-03-21T00:34:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fe69dfeac6d98c4a6864e937ab3d45f614d43dad

Modified files:
        ChangeLog Makefile.am configure.ac
        libpurple/gconf/Makefile.am
        libpurple/protocols/jabber/presence.c

ChangeLog: 

merge of '4c978163a43dcf3f47d33ebb76d86d9be5f52a24'
     and 'fbc5141857873eae0512b7cecad373ea0612207e'