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

[kevino at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2e409464ef3303fa2d77f2deb1b67c237caf3043
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 19 03:53:02 2009 +0000

    CURL build fix, use proper header name.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49764 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2d0d76b..027e9aa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-18  Kevin Ollivier  <kevino at theolliviers.com>
+
+        CURL build fix, use proper header name.
+
+        * platform/network/curl/ResourceHandleManager.h:
+
 2009-10-18  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/platform/network/curl/ResourceHandleManager.h b/WebCore/platform/network/curl/ResourceHandleManager.h
index 864c403..4d73d87 100644
--- a/WebCore/platform/network/curl/ResourceHandleManager.h
+++ b/WebCore/platform/network/curl/ResourceHandleManager.h
@@ -30,7 +30,7 @@
 
 #include "CString.h"
 #include "Frame.h"
-#include "String.h"
+#include "PlatformString.h"
 #include "Timer.h"
 #include "ResourceHandleClient.h"
 

-- 
WebKit Debian packaging