[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[cmarrin at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit c31c98d6bba1d3b3e8083c071f6b013427136c76
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 11 18:31:25 2009 +0000

    forgot to save Changelog
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52007 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ebe8c5a..ff9ef95 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 2009-12-11  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Adam Roben.
@@ -34,7 +33,6 @@
         (WebCore::WKCACFLayerRenderer::acceleratedCompositingAvailable):
         (WebCore::WKCACFLayerRenderer::createRenderer):
 
-=======
 2009-12-11  Steve Block  <steveblock at google.com>
 
         Reviewed by Darin Fisher.
@@ -48,7 +46,6 @@
         * platform/network/android/ResourceRequestAndroid.cpp: Added.
         (WebCore::initializeMaximumHTTPConnectionCountPerHost): Android-specific implementation.
 
->>>>>>> .r52005
 2009-12-11  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Darin Fisher.

-- 
WebKit Debian packaging