[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9cadcc2f5a1e192cfdfa63d4ba40f7ef027f0600
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 16 13:26:57 2009 +0000

    [Qt] Update outdated platform dependent expected file.
    
    Patch by Andras Becsi <becsi.andras at stud.u-szeged.hu> on 2009-10-16
    Reviewed by Tor Arne Vestbø.
    
    * platform/qt/editing/execCommand/toggle-compound-styles-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49678 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4f37b42..0cad5e5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-16  Andras Becsi  <becsi.andras at stud.u-szeged.hu>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Update outdated platform dependent expected file.
+
+        * platform/qt/editing/execCommand/toggle-compound-styles-expected.txt:
+
 2009-10-16  Shu Chang  <Chang.Shu at nokia.com>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/qt/editing/execCommand/toggle-compound-styles-expected.txt b/LayoutTests/platform/qt/editing/execCommand/toggle-compound-styles-expected.txt
index 43eb194..6c94fb9 100644
--- a/LayoutTests/platform/qt/editing/execCommand/toggle-compound-styles-expected.txt
+++ b/LayoutTests/platform/qt/editing/execCommand/toggle-compound-styles-expected.txt
@@ -7,7 +7,7 @@ PLATFORM-DEPENDNET TESTS
 one bold command converted <u><b>hello</b> world</u> to <u><b>hello world</b></u>
 one bold command converted <b>hello </b>world to <b>hello world</b>
 one bold command converted <u><b>hello </b></u>world to <u><b>hello </b></u><b>world</b>
-one italic command converted <i>hello</i> <img> to <i>hello </i><i><img></i>
+one italic command converted <i>hello</i> <img> to <i>hello <img></i>
 one italic command converted <s><b>hello<i> world</i></b></s> to <s><b><i>hello world</i></b></s>
 PLATFORM-INDEPENDNET TESTS
 PASS one bold command converted <u><span id='test'><b>hello</b></span><b>world</b></u> to <u><span id="test">hello</span>world</u>

-- 
WebKit Debian packaging