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

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit b165ecee4228bc4154fc3463ea1f4a3aebc9138b
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 4 07:15:25 2010 +0000

    2010-01-03  Adam Barth  <abarth at webkit.org>
    
            Unreviewed "build" fix.  Need to import ScriptError.
    
            * Scripts/webkitpy/buildsteps.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52705 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index cf6192b..c720846 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-03  Adam Barth  <abarth at webkit.org>
 
+        Unreviewed "build" fix.  Need to import ScriptError.
+
+        * Scripts/webkitpy/buildsteps.py:
+
+2010-01-03  Adam Barth  <abarth at webkit.org>
+
         Reviewed by Eric Seidel.
 
         [bzt] Make it easier to run submit-patch when previous run cancelled
diff --git a/WebKitTools/Scripts/webkitpy/buildsteps.py b/WebKitTools/Scripts/webkitpy/buildsteps.py
index 4c2125c..2ad850e 100644
--- a/WebKitTools/Scripts/webkitpy/buildsteps.py
+++ b/WebKitTools/Scripts/webkitpy/buildsteps.py
@@ -32,6 +32,7 @@ import StringIO
 from optparse import make_option
 
 from webkitpy.comments import bug_comment_from_commit_text
+from webkitpy.executive import ScriptError
 from webkitpy.grammar import pluralize
 from webkitpy.webkit_logging import log, error
 from webkitpy.webkitport import WebKitPort

-- 
WebKit Debian packaging