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

[mihaip at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit b525601f56a623a9dbc8a5035749e82904e0f029
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 3 18:29:00 2011 +0000

    2011-01-03  Mihai Parparita  <mihaip at chromium.org>
    
            Unreviewed, Chromium test expectation update.
    
            Fix duplicate expectation.
    
            * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 95f5023..024a286 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-03  Mihai Parparita  <mihaip at chromium.org>
+
+        Unreviewed, Chromium test expectation update.
+        
+        Fix duplicate expectation.
+
+        * platform/chromium/test_expectations.txt:
+
 2011-01-03  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Unreviewed, build fix.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index c001549..ad1a73d 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2738,7 +2738,7 @@ BUGWK48034 : platform/win/plugins/npn-invalidate-rect-invalidates-window.html =
 
 // Have been flaky for a long time.
 BUGWK48143 : svg/dom/altGlyph-dom.xhtml = CRASH PASS
-BUGWK48256 : fast/multicol/float-multicol.html = IMAGE+TEXT PASS
+BUGWK48256 WIN LINUX : fast/multicol/float-multicol.html = IMAGE+TEXT PASS
 BUGWK48263 : media/adopt-node-crash.html = TIMEOUT PASS
 BUGWK48341 : svg/W3C-SVG-1.1/masking-intro-01-f.svg = CRASH PASS
 BUGWK48352 : fast/blockflow/block-level-images.html = IMAGE PASS

-- 
WebKit Debian packaging