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

[eric.carlson at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 1346eae52afd6bcf21c57b76a6dbfa6df35fc301
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 20:20:37 2010 +0000

    2010-01-07  Eric Carlson  <eric.carlson at apple.com>
    
            Unreviewed, build fix.
    
            Skip LayoutTests/http/tests/media/video-error-abort.html
    
            * platform/gtk/Skipped:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52940 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 59e41e5..6d23f85 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-07  Eric Carlson  <eric.carlson at apple.com>
+
+        Unreviewed, build fix.
+
+        Skip LayoutTests/http/tests/media/video-error-abort.html
+
+        * platform/gtk/Skipped:
+
 2010-01-07  Csaba Osztrogonác  <ossy at webkit.org>
 
         Unreviewed trivial fix.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 17ca2b0..b6d0029 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -3430,6 +3430,7 @@ http/tests/local/send-dragged-file.html
 http/tests/media/video-play-stall-seek.html
 http/tests/media/video-play-stall.html
 http/tests/media/video-seekable-stall.html
+http/tests/media/video-error-abort.html
 http/tests/mime/standard-mode-does-not-load-stylesheet-with-text-plain-and-css-extension.html
 http/tests/mime/standard-mode-loads-stylesheet-with-empty-content-type.html
 http/tests/mime/standard-mode-loads-stylesheet-with-text-css-and-invalid-type.html

-- 
WebKit Debian packaging