pidgin.vv: ebe68278: merge of '25cc5bdbbd9c509be202ab9847764b...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: ebe68278e2ac4ce9fcb4152b27f095132a648648
Ancestor: 25cc5bdbbd9c509be202ab9847764b104f848577
Ancestor: 7bc60f1fd2abbf238f52a98f1f26da74ca462705
Author: maiku at soc.pidgin.im
Date: 2009-03-24T06:09:35
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/ebe68278e2ac4ce9fcb4152b27f095132a648648

Modified files:
        libpurple/Makefile.am libpurple/media.c
        libpurple/mediamanager.h

ChangeLog: 

merge of '25cc5bdbbd9c509be202ab9847764b104f848577'
     and '7bc60f1fd2abbf238f52a98f1f26da74ca462705'