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

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 957f2bca9864f2028bd5ba480b4bad98050a06a5
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 22 22:33:33 2009 +0000

    2009-09-22  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Simon Fraser.
    
            media/controls-after-reload.html crashes occasionally
            https://bugs.webkit.org/show_bug.cgi?id=29037
    
            Skip media/controls-after-reload.html for the same CVDisplayLink
            issue as seen with media/video-size-intrinsic-scale.html.
    
            * platform/mac-leopard/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48654 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index aafeee5..cccda54 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-22  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Simon Fraser.
+
+        media/controls-after-reload.html crashes occasionally
+        https://bugs.webkit.org/show_bug.cgi?id=29037
+
+        Skip media/controls-after-reload.html for the same CVDisplayLink
+        issue as seen with media/video-size-intrinsic-scale.html.
+
+        * platform/mac-leopard/Skipped:
+
 2009-09-22  Dumitru Daniliuc  <dumi at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/LayoutTests/platform/mac-leopard/Skipped b/LayoutTests/platform/mac-leopard/Skipped
index 96c7bef..5c1c0d0 100644
--- a/LayoutTests/platform/mac-leopard/Skipped
+++ b/LayoutTests/platform/mac-leopard/Skipped
@@ -17,4 +17,5 @@ platform/mac/fast/text/thai-combining-mark-positioning.html
 
 # Intermittent crashes/hangs caused by <rdar://problem/7228836>
 # https://bugs.webkit.org/show_bug.cgi?id=28845
+media/controls-after-reload.html
 media/video-size-intrinsic-scale.html

-- 
WebKit Debian packaging