pidgin: e59c4162: merge of '06fd8a15a3af927e3ce13b04af6e21...

[masca at cpw.pidgin.im]

----------------------------------------------------------------------
Revision: e59c416200fb2aa6b0d35d6c537620adca42e6af
Parent:   06fd8a15a3af927e3ce13b04af6e2159fb537dd9
Parent:   cd7e0618fa45ee113bac1516e7f907b02c79219a
Author:   masca at cpw.pidgin.im
Date:     08/22/11 23:22:06
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e59c416200fb2aa6b0d35d6c537620adca42e6af

Changelog: 

merge of '06fd8a15a3af927e3ce13b04af6e2159fb537dd9'
     and 'cd7e0618fa45ee113bac1516e7f907b02c79219a'

Changes against parent 06fd8a15a3af927e3ce13b04af6e2159fb537dd9

  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/mxit/profile.c

Changes against parent cd7e0618fa45ee113bac1516e7f907b02c79219a

  patched  pidgin/gtkdocklet.c
  patched  pidgin/gtkutils.c