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

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 36d5b76b94218468a98e7e4e9076f3fa92f4b0b8
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 2 21:10:41 2009 +0000

    Rubber-stamped by Adam Roben.
    
    Skip http/tests/cache/subresource-failover-to-network.html because it
    is flaky on Windows, fixing it is being tracked by
    https://bugs.webkit.org/show_bug.cgi?id=32038.
    
    * platform/win/Skipped:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51611 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 58a51a2..1a1df8e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-02  Brian Weinstein  <bweinstein at apple.com>
+
+        Rubber-stamped by Adam Roben.
+
+        Skip http/tests/cache/subresource-failover-to-network.html because it
+        is flaky on Windows, fixing it is being tracked by 
+        https://bugs.webkit.org/show_bug.cgi?id=32038.
+
+        * platform/win/Skipped:
+
 2009-12-02  Csaba Osztrogonác  <ossy at webkit.org>
 
         [Qt] Put tests into skiplist because of missing layoutTestController.evaluateInWebInspector().
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 0360a52..a17061b 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -719,3 +719,6 @@ http/tests/navigation/reload-subframe-frame.html
 http/tests/navigation/reload-subframe-iframe.html
 http/tests/plugins/post-url-file.html
 inspector/timeline-network-resource.html
+
+# https://bugs.webkit.org/show_bug.cgi?id=32038 - Flaky on Windows
+http/tests/cache/subresource-failover-to-network.html

-- 
WebKit Debian packaging