[Buildbot-commits] buildbot/buildbot/process step.py,1.106,1.107

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21610/buildbot/process

Modified Files:
	step.py 
Log Message:
[project @ filetransfer: merge from trunk, resolve conflict]

Original author: warner at lothar.com
Date: 2006-09-08 21:46:41

Index: step.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step.py,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- step.py	15 Sep 2006 14:49:12 -0000	1.106
+++ step.py	15 Sep 2006 14:49:18 -0000	1.107
@@ -1,8 +1,5 @@
 # -*- test-case-name: buildbot.test.test_steps -*-
 
-import time, random, types, re, warnings
-from email.Utils import formatdate
-
 from twisted.internet import reactor, defer, error
 from twisted.protocols import basic
 from twisted.spread import pb