[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 7a76e2a7ff5899d02d4054b7ac8a32be8d2d71c5
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 15 17:53:02 2009 +0000

    2009-10-15  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Unreviewed. Help text fix - Web Sockets default is no, not yes.
    
            * configure.ac:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49639 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index d0512f6..a58a8c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-15  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Unreviewed. Help text fix - Web Sockets default is no, not yes.
+
+        * configure.ac:
+
 2009-10-12  Jan Michael Alonzo  <jmalonzo at webkit.org>
 
         Rubberstamped by Eric Seidel.
diff --git a/configure.ac b/configure.ac
index 7638a34..c881935 100644
--- a/configure.ac
+++ b/configure.ac
@@ -517,7 +517,7 @@ fi
 AC_MSG_CHECKING([whether to enable Web Sockets support])
 AC_ARG_ENABLE(web_sockets,
               AC_HELP_STRING([--enable-web-sockets],
-                             [enable support for Web Sockets [default=yes]]),
+                             [enable support for Web Sockets [default=no]]),
               [],[enable_web_sockets="no"])
 AC_MSG_RESULT([$enable_web_sockets])
 

-- 
WebKit Debian packaging