[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[ossy at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 581c9606bbdc778792d3a0803feb59e21056b33d
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 22:53:23 2010 +0000

    Buildfix for r53646.
    
    Reviewed by Dave Hyatt.
    
    * bindings/js/SerializedScriptValue.cpp: path of JSLock.h fixed.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53652 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7876716..752a3b5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-01-21  Csaba Osztrogonác  <ossy at webkit.org>
 
+        Reviewed by Dave Hyatt.
+
+        Buildfix for r53646.
+
+        * bindings/js/SerializedScriptValue.cpp: path of JSLock.h fixed.
+
+2010-01-21  Csaba Osztrogonác  <ossy at webkit.org>
+
         Unreviewed buildfix after r53644.
 
         * platform/Scrollbar.cpp:
diff --git a/WebCore/bindings/js/SerializedScriptValue.cpp b/WebCore/bindings/js/SerializedScriptValue.cpp
index c30c571..f0e7b6e 100644
--- a/WebCore/bindings/js/SerializedScriptValue.cpp
+++ b/WebCore/bindings/js/SerializedScriptValue.cpp
@@ -32,9 +32,9 @@
 #include "JSFile.h"
 #include "JSFileList.h"
 #include <JavaScriptCore/APICast.h>
-#include <JavaScriptCore/JSLock.h>
 #include <runtime/DateInstance.h>
 #include <runtime/ExceptionHelpers.h>
+#include <runtime/JSLock.h>
 #include <runtime/PropertyNameArray.h>
 #include <wtf/HashTraits.h>
 #include <wtf/Vector.h>

-- 
WebKit Debian packaging