# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1187631771 0
# Node ID ae5c82fd7920565137a7a7568adeb618e56621c1
# Parent  24176a09220c7376d44636ee1993db6973db3fd4# Parent  c9aeb5a53d4d3b4384bb3950519f92e0f3722bd1
merge of '24c8940605f5b11b2aea17c6ca6f3094dff141ab'
     and 'e1e5c6d6761c5ca78ed3ba45df742983421c1082'

diff -r 24176a09220c -r ae5c82fd7920 libpurple/protocols/yahoo/Makefile.am
--- a/libpurple/protocols/yahoo/Makefile.am	Mon Aug 20 17:40:33 2007 +0000
+++ b/libpurple/protocols/yahoo/Makefile.am	Mon Aug 20 17:42:51 2007 +0000
@@ -10,7 +10,7 @@
 	yahoochat.h \
 	yahoochat.c \
 	yahoo_aliases.c \
-	yahoo_alisaes.h \
+	yahoo_aliases.h \
 	yahoo_auth.c \
 	yahoo_auth.h \
 	yahoo_crypt.h \