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

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 2147de89929da6f34650448a04deb0465860c896
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 27 03:53:50 2010 +0000

    010-02-26  Dirk Pranke  <dpranke at chromium.org>
    
            Unreviewed, build fix
    
            third time's the charm getting this path right?
    
            * pywebsocket/mod_pywebsocket/standalone.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55339 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4f3f19e..49cb07e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-26  Dirk Pranke  <dpranke at chromium.org>
+
+        Unreviewed, build fix
+
+        third time's the charm getting this path right?
+
+        * pywebsocket/mod_pywebsocket/standalone.py:
+
 2010-02-26  Dumitru Daniliuc  <dumi at chromium.org>
 
         Unreviewed, build fix.
diff --git a/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py b/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py
index 1302e13..9e58e2d 100755
--- a/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py
+++ b/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py
@@ -34,9 +34,9 @@ import os
 import sys
 
 sys.path.append(os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])),
-                             "..", "Scripts", "webkitpy", "thirdparty",
-                             "pywebsocket", "mod_pywebsocket"))
-import standalone
+                             "..", "..", "Scripts", "webkitpy", "thirdparty",
+                             "pywebsocket"))
+from mod_pywebsocket import standalone
 
 if __name__ == '__main__':
     standalone._main()

-- 
WebKit Debian packaging