[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[xji at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 13f94ac39675a37140b493f173ee10869dce840d
Author: xji at chromium.org <xji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 22:43:28 2010 +0000

    Performance improvement for FontLinux.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68589 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9aea5f7..93005b0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2182,6 +2182,7 @@
         very least, the method should had been originally added with the "webkit"
         prefix, which was not the case.
 
+<<<<<<< HEAD
         * dom/Document.idl:
 
 2010-09-26  Renata Hodovan  <reni at inf.u-szeged.hu>
@@ -2480,6 +2481,8 @@
         (WebCore::stringToLengthType):
         (WebCore::SVGLength::setValueAsString):
 
+=======
+>>>>>>> Performance improvement for FontLinux.
 2010-09-24  Luiz Agostini  <luiz.agostini at openbossa.org>
         Reviewed by Kenneth Rohde Christiansen.
 

-- 
WebKit Debian packaging