pidgin: 6cba0d6c: merge of '64f210128f2360d48b91e7008fe500...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 6cba0d6cd68fbf5e0d3989623f7e5a58c6b4016d
Parent:   64f210128f2360d48b91e7008fe5004b5963d425
Parent:   ea348fd63df8138afe8b803f9e352a9273ae7234
Author:   qulogic at pidgin.im
Date:     09/22/11 21:56:00
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6cba0d6cd68fbf5e0d3989623f7e5a58c6b4016d

Changelog: 

merge of '64f210128f2360d48b91e7008fe5004b5963d425'
     and 'ea348fd63df8138afe8b803f9e352a9273ae7234'

Changes against parent 64f210128f2360d48b91e7008fe5004b5963d425

  patched  pidgin/gtkconv-theme.c
  patched  pidgin/plugins/Makefile.am
  patched  pidgin/plugins/gestures/gestures.c

Changes against parent ea348fd63df8138afe8b803f9e352a9273ae7234

  patched  libpurple/account.c
  patched  pidgin/gtkprefs.c