pidgin: 4e1594b3: merge of '56aef266e32da36a675d0806e9c68c...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: 4e1594b395b5df0fa3f48a1145dcd556d46aa8d7
Ancestor: 56aef266e32da36a675d0806e9c68c98e8b714af
Ancestor: a447805fc4e48cb0552ae9af1d32da562e5c1dff
Author: maiku at pidgin.im
Date: 2009-08-28T07:32:07
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4e1594b395b5df0fa3f48a1145dcd556d46aa8d7

Modified files:
        libpurple/media.c pidgin/gtkdialogs.c

ChangeLog: 

merge of '56aef266e32da36a675d0806e9c68c98e8b714af'
     and 'a447805fc4e48cb0552ae9af1d32da562e5c1dff'