propagate from branch 'im.pidgin.cpw.malu.xmpp.google_refactor' (head 205b0ad983443d1b6383b445b66abed6b8c5f4b2)
v2.7.4 v2.7.5 v2.7.6 v2.7.7 v2.7.8 v2.7.9
2010-08-31, Marcus Lundblad