pidgin: 5ed51074: merge of '3083d5a5d5b46193be6849e67ddef5...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 5ed5107491b0bb550f96972559208acad3bf3095
Ancestor: 3083d5a5d5b46193be6849e67ddef5bb26111789
Ancestor: b14459623a35c6926c2e383067d203bff65fd06f
Author: qulogic at pidgin.im
Date: 2010-05-28T06:24:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5ed5107491b0bb550f96972559208acad3bf3095

Modified files:
        ChangeLog configure.ac pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/tray/hicolor/index.theme

ChangeLog: 

merge of '3083d5a5d5b46193be6849e67ddef5bb26111789'
     and 'b14459623a35c6926c2e383067d203bff65fd06f'