# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1169863577 0
# Node ID 07f3ed5adb422ca8ba529647d5c10ecceefc1a50
# Parent  051a5c4f0917ea2581815f48ea1216afe7f72bbb# Parent  c218d8839902e6cca98e390e71dfae58b0b133bc
merge of '6f79d2e845520107afda4aa99727183840cf5078'
     and '7874eb23324d2920dd6c344cc81192164319adac'

diff -r 051a5c4f0917 -r 07f3ed5adb42 pidgin/pixmaps/emotes/default/22/theme
--- a/pidgin/pixmaps/emotes/default/22/theme	Sat Jan 27 02:06:09 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/theme	Sat Jan 27 02:06:17 2007 +0000
@@ -187,7 +187,7 @@
 boy.png /男 /<11> /nan /man
 
 
-[YAHOO]
+[Yahoo]
 angel.png		o:-) O:-) 0:-)
 angry.png		X-( x-( X( x(
 lashes.png		;;)