[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[zimmermann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit dc14d89f599791786e6437f6f68d01f58f1add06
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 15:47:27 2010 +0000

    2010-02-17  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Not reviewed. Try to turn windows slaves again, by skipping two websocket tests that fail reliable.
    
            * platform/win/Skipped:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54898 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9e8f20d..06f416d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-17  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Not reviewed. Try to turn windows slaves again, by skipping two websocket tests that fail reliable.
+
+        * platform/win/Skipped:
+
 2010-02-17  Gustavo Noronha Silva  <gns at gnome.org>
 
         Typo in test name.
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 037f600..9a51eca 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -768,3 +768,7 @@ fast/text/glyph-reordering.html
 
 # Accept header is handled by the browser
 http/tests/misc/image-checks-for-accept.html
+
+# Tests timeout: https://bugs.webkit.org/show_bug.cgi?id=35041
+websocket/tests/frame-lengths.html
+websocket/tests/simple-stress.html

-- 
WebKit Debian packaging