Merging in latest boto.

boto/s3/multipart.py

Index: boto/s3/multipart.py
diff --git a/boto/s3/multipart.py b/boto/s3/multipart.py
index f68540aeaf1029e2cea3bde63e5691a38e9b3e4c..8befc5eaee1fa5957ac2c8a6dabe38390e514663 100644
--- a/boto/s3/multipart.py
+++ b/boto/s3/multipart.py
@@ -102,7 +102,7 @@ class Part(object):
         else:
             setattr(self, name, value)
         
-def part_lister(mpupload, part_number_marker=''):
+def part_lister(mpupload, part_number_marker=None):
     """
     A generator function for listing parts of a multipart upload.
     """
@@ -139,7 +139,7 @@ class MultiPartUpload(object):
         return '<MultiPartUpload %s>' % self.key_name
 
     def __iter__(self):
-        return part_lister(self, part_number_marker=self.part_number_marker)
+        return part_lister(self)
 
     def to_xml(self):
         self.get_all_parts()
@@ -212,8 +212,7 @@ class MultiPartUpload(object):
             return self._parts
 
     def upload_part_from_file(self, fp, part_num, headers=None, replace=True,
-                               cb=None, num_cb=10, policy=None, md5=None,
-                               reduced_redundancy=False):
+                               cb=None, num_cb=10, policy=None, md5=None):
         """
         Upload another part of this MultiPart Upload.
         
@@ -231,7 +230,8 @@ class MultiPartUpload(object):
         query_args = 'uploadId=%s&partNumber=%d' % (self.id, part_num)
         key = self.bucket.new_key(self.key_name)
         key.set_contents_from_file(fp, headers, replace, cb, num_cb, policy,
-                                   md5, reduced_redundancy, query_args)
+                                   md5, reduced_redundancy=False,
+                                   query_args=query_args)
 
     def complete_upload(self):
         """
@@ -243,8 +243,8 @@ class MultiPartUpload(object):
         :returns: An object representing the completed upload.
         """
         xml = self.to_xml()
-        self.bucket.complete_multipart_upload(self.key_name,
-                                              self.id, xml)
+        return self.bucket.complete_multipart_upload(self.key_name,
+                                                     self.id, xml)
 
     def cancel_upload(self):
         """