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

[ossy at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 528831931e715d4f2d9cdc1d3277bbc883b55eb8
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 19:45:58 2010 +0000

    Unreviewed trivial fix.
    
    LayoutTests/media/video-error-abort.html moved to LayoutTests/http/tests/media/video-error-abort.html
    by r52923, but wasn't renamed in skiplist by this commit.
    
    * platform/mac/Skipped:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52936 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a57bd94..59e41e5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-07  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Unreviewed trivial fix.
+
+        LayoutTests/media/video-error-abort.html moved to LayoutTests/http/tests/media/video-error-abort.html
+        by r52923, but wasn't renamed in skiplist by this commit.
+
+        * platform/mac/Skipped:
+
 2010-01-07  Eric Carlson  <eric.carlson at apple.com>
 
         Unreviewed, build fix.
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 473697a..421b17d 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -57,7 +57,7 @@ svg/hixie/perf/001.xml
 svg/hixie/perf/002.xml
 
 # <rdar://problem/6710625> Test media/video-error-abort.html doesn't work
-media/video-error-abort.html
+http/tests/media/video-error-abort.html
 
 # This port doesn't support Geolocation.
 fast/dom/Geolocation

-- 
WebKit Debian packaging