[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[hyatt at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 038507ac3065a04777804751c40bfe684ce4cf27
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 31 21:39:56 2011 +0000

    Fix 32-bit build bustage.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77158 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/rendering/RenderCombineText.cpp b/Source/WebCore/rendering/RenderCombineText.cpp
index 5084e62..504a8fb 100644
--- a/Source/WebCore/rendering/RenderCombineText.cpp
+++ b/Source/WebCore/rendering/RenderCombineText.cpp
@@ -25,7 +25,7 @@
 
 namespace WebCore {
 
-const float textCombineMargin = 1.1; // Allow em + 10% margin
+const float textCombineMargin = 1.1f; // Allow em + 10% margin
 
 RenderCombineText::RenderCombineText(Node* node, PassRefPtr<StringImpl> string)
      : RenderText(node, string)

-- 
WebKit Debian packaging