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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 62f46b1c6717af862597ae0c7396594ff7b45fb0
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 26 18:04:25 2010 +0000

    Fix duplicate vsprops name
    
    * win/tools/vsprops/FeatureDefinesCairo.vsprops: Renamed to
    "FeatureDefinesCairo" to match the filename.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70539 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 88ccf0c..23029f5 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-26  Adam Roben  <aroben at apple.com>
+
+        Fix duplicate vsprops name
+
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops: Renamed to
+        "FeatureDefinesCairo" to match the filename.
+
 2010-10-23  Alexey Proskuryakov  <ap at apple.com>
 
         Windows build fix.
diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
index 1aa406a..9981f92 100644
--- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
@@ -5,7 +5,7 @@
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="FeatureDefines"
+	Name="FeatureDefinesCairo"
 	>
   <Tool
 		Name="VCCLCompilerTool"

-- 
WebKit Debian packaging