--- euca2ools-1.3.1/bin/euca-delete-bundle.boto20	2010-09-04 06:01:51.000000000 -0700
+++ euca2ools-1.3.1/bin/euca-delete-bundle	2011-03-07 14:11:59.118516970 -0800
@@ -40,7 +40,6 @@ from xml.dom import minidom
 from euca2ools import Euca2ool, FileValidationError, Util, \
     ConnectionFailed
 from boto.exception import S3ResponseError
-from boto.s3 import Connection
 from boto.s3.key import Key
 
 usage_string = \
--- euca2ools-1.3.1/bin/euca-download-bundle.boto20	2011-03-07 14:03:04.228563367 -0800
+++ euca2ools-1.3.1/bin/euca-download-bundle	2011-03-07 14:13:31.383258699 -0800
@@ -40,7 +40,6 @@ from xml.dom import minidom
 from euca2ools import Euca2ool, FileValidationError, Util, \
     ConnectionFailed
 from boto.exception import S3ResponseError
-from boto.s3 import Connection
 from boto.s3.key import Key
 
 usage_string = \
--- euca2ools-1.3.1/bin/euca-upload-bundle.boto20	2010-09-04 06:01:51.000000000 -0700
+++ euca2ools-1.3.1/bin/euca-upload-bundle	2011-03-07 14:10:48.589950583 -0800
@@ -40,7 +40,6 @@ from xml.dom import minidom
 from euca2ools import Euca2ool, FileValidationError, Util, \
     ConnectionFailed
 from boto.exception import S3ResponseError, S3CreateError
-from boto.s3 import Connection
 from boto.s3.key import Key
 
 usage_string = \
--- euca2ools-1.3.1/euca2ools/euca2ools/__init__.py.boto20	2011-03-08 11:21:03.963393347 -0800
+++ euca2ools-1.3.1/euca2ools/euca2ools/__init__.py	2011-03-08 11:23:19.065142500 -0800
@@ -53,6 +53,7 @@ from boto.ec2.regioninfo import RegionIn
 from boto.ec2.blockdevicemapping import BlockDeviceMapping
 from boto.ec2.blockdevicemapping import EBSBlockDeviceType
 from boto.ec2.connection import EC2Connection
+from boto.s3.connection import S3Connection
 from boto.resultset import ResultSet
 import logging
 import base64
@@ -648,7 +649,7 @@ class Euca2ool:
                 path=self.service_path,
                 )
         else:
-            return boto.s3.Connection(
+            return S3Connection(
                 aws_access_key_id=self.ec2_user_access_key,
                 aws_secret_access_key=self.ec2_user_secret_key,
                 is_secure=self.is_secure,