pidgin/android/libpurple

Merge with release-2.x.y
mxit-2.x.y
2013-04-03, Andrew Victor
07ffa66fd57b
Merge with release-2.x.y
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im