# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1176925717 0
# Node ID 608f9e9e67636a4cff8d5a2f97ae76e19ee5c4da
# Parent  9709b1bc5d61f382f9f0f6cc0cb3598574c67d86# Parent  502b69976fe1d3d4561b5f0951b5214234414edb
merge of '6f1c8b328654eaabb362aa93ab1a72177353111b'
     and '869c7461d9e5a340e106453ed11f5dd9ed388d5b'

diff -r 502b69976fe1 -r 608f9e9e6763 libpurple/protocols/yahoo/yahoo_auth.c
diff -r 502b69976fe1 -r 608f9e9e6763 libpurple/protocols/yahoo/yahoo_auth.h