pidgin: f25348fd: merge of '269d61606f225241d08360ffde046e...

Fri Apr 3 14:41:14 EDT 2009

-----------------------------------------------------------------
Revision: f25348fdce436002d7d508f074aaa70fd9491f01
Ancestor: 269d61606f225241d08360ffde046e471f03b833
Ancestor: 8c2755d7dda295a13479b339d8c3a21851906f70
Author: paul at darkrain42.org
Date: 2009-04-03T16:38:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f25348fdce436002d7d508f074aaa70fd9491f01

Modified files:
        libpurple/media.h pidgin/gtkmedia.c

ChangeLog: 

merge of '269d61606f225241d08360ffde046e471f03b833'
     and '8c2755d7dda295a13479b339d8c3a21851906f70'