maiku.vv: cbb06fda: merge of '3fd2b0bf399bc4820c027060ec6c82...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: cbb06fda6f01f91df733ab56b1efb1b1f3e826f3
Ancestor: 3fd2b0bf399bc4820c027060ec6c82ed1ca6ca45
Ancestor: afa3dc92175256438bf5eb8acb7876eddc64ba01
Author: maiku at soc.pidgin.im
Date: 2008-08-27T00:12:57
Branch: im.pidgin.maiku.vv
URL: http://d.pidgin.im/viewmtn/revision/info/cbb06fda6f01f91df733ab56b1efb1b1f3e826f3

Modified files:
        configure.ac finch/gntmedia.c libpurple/media.c
        libpurple/protocols/jabber/jingle.c

ChangeLog: 

merge of '3fd2b0bf399bc4820c027060ec6c82ed1ca6ca45'
     and 'afa3dc92175256438bf5eb8acb7876eddc64ba01'