pidgin: 9e7616db: merge of '4beb86df935d5dfd7ce4107bcabe19...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 9e7616dbab2878bcc9f4b412bca1f55c903a337e
Parent:   4beb86df935d5dfd7ce4107bcabe1944e59a63a2
Parent:   7c414c17049558cf4b4e280a2c1a14eea7faf465
Author:   markdoliner at pidgin.im
Date:     06/12/11 05:37:15
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9e7616dbab2878bcc9f4b412bca1f55c903a337e

Changelog: 

merge of '4beb86df935d5dfd7ce4107bcabe1944e59a63a2'
     and '7c414c17049558cf4b4e280a2c1a14eea7faf465'

Changes against parent 4beb86df935d5dfd7ce4107bcabe1944e59a63a2

  patched  configure.ac

Changes against parent 7c414c17049558cf4b4e280a2c1a14eea7faf465

  patched  ChangeLog
  patched  libpurple/media/backend-fs2.c