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

[senorblanco at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit c0c200e29ba37dc53c6261e87d5f45349e77d2b6
Author: senorblanco at chromium.org <senorblanco at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 01:55:27 2011 +0000

    2011-01-06  Stephen White  <senorblanco at chromium.org>
    
            Unreviewed; test expectations update.
    
            * platform/chromium-gpu/test_expectations.txt:
            Remove duplicate expectations.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75216 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 36e3434..f0cb3ef 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-06  Stephen White  <senorblanco at chromium.org>
+
+        Unreviewed; test expectations update.
+
+        * platform/chromium-gpu/test_expectations.txt:
+        Remove duplicate expectations.
+
 2011-01-06  Mihai Parparita  <mihaip at chromium.org>
 
         Unreviewed, test expectation update.
diff --git a/LayoutTests/platform/chromium-gpu/test_expectations.txt b/LayoutTests/platform/chromium-gpu/test_expectations.txt
index a1fade1..9420190 100644
--- a/LayoutTests/platform/chromium-gpu/test_expectations.txt
+++ b/LayoutTests/platform/chromium-gpu/test_expectations.txt
@@ -212,7 +212,7 @@ BUGWEBGL : fast/canvas/webgl/point-size.html = TEXT
 BUGCR60651 MAC WIN LINUX RELEASE: fast/canvas/webgl/gl-object-get-calls.html = TEXT PASS
 BUGCR60651 MAC LINUX DEBUG: fast/canvas/webgl/gl-object-get-calls.html = TEXT PASS
 BUGWK47243 WIN DEBUG : fast/canvas/webgl/gl-object-get-calls.html = PASS CRASH
-BUGCR60651 WIN : fast/canvas/webgl/glsl-conformance.html = TIMEOUT FAIL
+// BUGCR60651 WIN : fast/canvas/webgl/glsl-conformance.html = TIMEOUT FAIL
 // BUGCR60651 : fast/canvas/webgl/uniform-location.html = TIMEOUT FAIL
 BUGWK47243 LINUX : fast/canvas/webgl/uniform-location.html = TIMEOUT TEXT
 BUGWK47243 WIN : fast/canvas/webgl/uniform-location.html = TIMEOUT CRASH

-- 
WebKit Debian packaging