pidgin: 6c7bc4d2: merge of '1f6b3e2158dd96486ec32995b3f4f9...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 6c7bc4d299467c6be45dd213e52cffe938c31556
Ancestor: 1f6b3e2158dd96486ec32995b3f4f93d6b376780
Ancestor: 84c7f6ba2f4be4be1e1698201fae77872ac21fee
Author: datallah at pidgin.im
Date: 2010-05-26T13:50:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6c7bc4d299467c6be45dd213e52cffe938c31556

Added files:
        pidgin/pixmaps/tray/hicolor/index.theme
Modified files:
        pidgin/gtkdocklet-gtk.c pidgin/pixmaps/Makefile.am po/de.po

ChangeLog: 

merge of '1f6b3e2158dd96486ec32995b3f4f93d6b376780'
     and '84c7f6ba2f4be4be1e1698201fae77872ac21fee'