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

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7d7f5cc008a4ab69d29b778a9fc0fd0dbb9f20f2
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 14:54:13 2010 +0000

    Oops, refix previous submit (patch conflict not resolved correctly)
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53624 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 4b4a888..df7bc31 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2741,7 +2741,6 @@ SOURCES += \
 symbian {
     shared {
         contains(CONFIG, def_files) {
-        contains(MMP_RULES, defBlock) {
             defFilePath=../WebKit/qt/symbian
         } else {
             MMP_RULES += EXPORTUNFROZEN

-- 
WebKit Debian packaging