# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1191171319 0
# Node ID 2bb82b05d30af015185ae0662a2141a9d45dcf22
# Parent  2e5ee1bf530080acfcaea0e1308f8fb42f7d3640# Parent  3e569b1b037118036a0622c13fdae5f821b5c0c0
merge of '07d5798f8a0b64518b4697e0376f5ceeddbb61e2'
     and 'da7520dee75fbe063aa7747c5452551d0030abee'

diff -r 2e5ee1bf5300 -r 2bb82b05d30a configure.ac
--- a/configure.ac	Sun Sep 30 16:55:15 2007 +0000
+++ b/configure.ac	Sun Sep 30 16:55:19 2007 +0000
@@ -1460,7 +1460,7 @@
 	[enable_nss="$enableval"],
 	[enable_nss="yes"])
 
-msg_ssl="None (MSN and Google Talk will not work without SSL!)"
+msg_ssl="None. MSN, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
 
 dnl #
 dnl # Check for GnuTLS if it's specified.
diff -r 2e5ee1bf5300 -r 2bb82b05d30a finch/gntconv.c
diff -r 2e5ee1bf5300 -r 2bb82b05d30a libpurple/protocols/oscar/oscar.c