pidgin: d918cdc5: merge of '74a81229c626a318447546176d5b27...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: d918cdc525638623e1e461b9967485eec5d758ee
Ancestor: 74a81229c626a318447546176d5b27a0197a44a4
Ancestor: baeaaf7de69d9f99b7545dda73f219292c4dd106
Author: datallah at pidgin.im
Date: 2010-06-14T22:09:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d918cdc525638623e1e461b9967485eec5d758ee

Modified files:
        ChangeLog libpurple/protocols/yahoo/libymsg.c
        libpurple/tests/test_util.c libpurple/util.c

ChangeLog: 

merge of '74a81229c626a318447546176d5b27a0197a44a4'
     and 'baeaaf7de69d9f99b7545dda73f219292c4dd106'