# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1250400187 0
# Node ID ce50e961f650d32ccf2a5466349e5d557fc78a8d
# Parent  df920ad8cf4f9030a407dcaa919c002291270ce1# Parent  6d3f3473cb4c805903a8110bedfb45c677c0954b
merge of '319edba55f1c66810f6a7a2af17e808a5bc75e3e'
     and '6ffba0724b246f1a87f83b1b19299aefcdd48142'

diff -r df920ad8cf4f -r ce50e961f650 libpurple/protocols/yahoo/libyahoo.c
--- a/libpurple/protocols/yahoo/libyahoo.c	Sun Aug 16 03:27:56 2009 +0000
+++ b/libpurple/protocols/yahoo/libyahoo.c	Sun Aug 16 05:23:07 2009 +0000
@@ -278,7 +278,7 @@
 	NULL,                                             /**< dependencies   */
 	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
 	"prpl-yahoo",                                     /**< id             */
-	"Yahoo!",	                                      /**< name           */
+	"Yahoo",	                                      /**< name           */
 	DISPLAY_VERSION,                                  /**< version        */
 	                                                  /**  summary        */
 	N_("Yahoo! Protocol Plugin"),
diff -r df920ad8cf4f -r ce50e961f650 libpurple/protocols/yahoo/libyahoojp.c
--- a/libpurple/protocols/yahoo/libyahoojp.c	Sun Aug 16 03:27:56 2009 +0000
+++ b/libpurple/protocols/yahoo/libyahoojp.c	Sun Aug 16 05:23:07 2009 +0000
@@ -174,7 +174,7 @@
 	NULL,                                             /**< dependencies   */
 	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
 	"prpl-yahoojp",                                     /**< id             */
-	"Yahoo! JAPAN",	                                      /**< name           */
+	"Yahoo JAPAN",	                                      /**< name           */
 	DISPLAY_VERSION,                                  /**< version        */
 	                                                  /**  summary        */
 	N_("Yahoo! JAPAN Protocol Plugin"),