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

[beidson at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit ef851c120ca79f56422c0992f7baf275362d3d34
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 3 04:40:26 2009 +0000

    Rubberstamped by Mark Rowe.
    
    Fix a typo in Mark's last commit.
    
    * loader/archive/ArchiveFactory.cpp:
    (WebCore::archiveMIMETypes):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50440 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 15ebe73..ea685b8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-02  Brady Eidson  <beidson at apple.com>
+
+        Rubberstamped by Mark Rowe.
+
+        Fix a typo in Mark's last commit.
+
+        * loader/archive/ArchiveFactory.cpp:
+        (WebCore::archiveMIMETypes):
+
 2009-11-02  Mark Rowe  <mrowe at apple.com>
 
         Rubber-stamped by Brady Eidson.
diff --git a/WebCore/loader/archive/ArchiveFactory.cpp b/WebCore/loader/archive/ArchiveFactory.cpp
index 2dfe53c..d09b064 100644
--- a/WebCore/loader/archive/ArchiveFactory.cpp
+++ b/WebCore/loader/archive/ArchiveFactory.cpp
@@ -60,7 +60,7 @@ static ArchiveMIMETypesMap& archiveMIMETypes()
     if (initialized)
         return mimeTypes;
 
-#if PLATFORM(CF) & !PLATFORM(QT)
+#if PLATFORM(CF) && !PLATFORM(QT)
     mimeTypes.set("application/x-webarchive", archiveFactoryCreate<LegacyWebArchive>);
 #endif
 

-- 
WebKit Debian packaging