[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[jeremy at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 8270c10eff3bdd62448013b8ba5f6cadec4c89c2
Author: jeremy at chromium.org <jeremy at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 23 13:09:42 2010 +0000

    2010-12-23  Jeremy Moskovich  <jeremy at chromium.org>
    
            Unreviewed test expectations update.
    
            Fix duplicate expectation warning for media/video-controls-rendering.html introduced in r74535.
    
            * platform/chromium/test_expectations.txt:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74550 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cc4a941..6dd1c9d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-23  Jeremy Moskovich  <jeremy at chromium.org>
+
+        Unreviewed test expectations update.
+
+        Fix duplicate expectation warning for media/video-controls-rendering.html introduced in r74535.
+
+        * platform/chromium/test_expectations.txt:
+
 2010-12-23  Csaba Osztrogonác  <ossy at webkit.org>
 
         Unreviewed. Update Qt specific expected file after r74539.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 8c23b58..8daaee8 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3271,7 +3271,7 @@ BUGCR59704 : media/controls-after-reload.html = IMAGE+TEXT
 BUGCR59704 : media/controls-strict.html = IMAGE+TEXT
 BUGCR59704 : media/controls-styling.html = IMAGE+TEXT
 BUGCR59704 : media/controls-without-preload.html = IMAGE+TEXT
-BUGCR59704 : media/video-controls-rendering.html = IMAGE+TEXT
+BUGCR59704 WIN LINUX : media/video-controls-rendering.html = IMAGE+TEXT
 BUGCR59704 : media/video-display-toggle.html = IMAGE+TEXT TIMEOUT
 BUGCR59704 : media/video-empty-source.html = IMAGE+TEXT
 BUGCR59704 : media/video-no-audio.html = IMAGE+TEXT

-- 
WebKit Debian packaging