Merge branch 'develop' of github.com:boto/boto into develop

3 files changed, 11 insertions, 3 deletions

diff --git a/boto/ec2/autoscale/launchconfig.py b/boto/ec2/autoscale/launchconfig.py
index 8811fb6b..526f4686 100644
--- a/boto/ec2/autoscale/launchconfig.py
+++ b/boto/ec2/autoscale/launchconfig.py
@@ -173,7 +173,10 @@ class LaunchConfiguration(object):
         elif name == 'RamdiskId':
             self.ramdisk_id = value
         elif name == 'UserData':
-            self.user_data = base64.b64decode(value)
+            try:
+                self.user_data = base64.b64decode(value)
+            except TypeError:
+                self.user_data = value
         elif name == 'LaunchConfigurationARN':
             self.launch_configuration_arn = value
         elif name == 'InstanceMonitoring':
diff --git a/boto/fps/connection.py b/boto/fps/connection.py
index 1bb95dfd..27eef8f9 100644
--- a/boto/fps/connection.py
+++ b/boto/fps/connection.py
@@ -218,6 +218,7 @@ class FPSConnection(AWSQueryConnection):
     def pay(self, transactionAmount, senderTokenId,
             recipientTokenId=None,
             chargeFeeTo="Recipient",
+            marketplaceFixedFee=None, marketplaceVariableFee=None,
             callerReference=None, senderReference=None, recipientReference=None,
             senderDescription=None, recipientDescription=None,
             callerDescription=None, metadata=None,
@@ -238,6 +239,10 @@ class FPSConnection(AWSQueryConnection):
                 recipientTokenId if recipientTokenId is not None
                 else boto.config.get("FPS", "recipient_token")
                 )
+        if(marketplaceFixedFee != None):
+            params['MarketplaceFixedFee'] = marketplaceFixedFee
+        if(marketplaceVariableFee != None):
+            params['MarketplaceVariableFee'] = marketplaceVariableFee
         if(transactionDate != None):
             params['TransactionDate'] = transactionDate
         if(senderReference != None):
diff --git a/boto/s3/connection.py b/boto/s3/connection.py
index 211f344e..afdc280f 100644
--- a/boto/s3/connection.py
+++ b/boto/s3/connection.py
@@ -408,8 +408,8 @@ class S3Connection(AWSAuthConnection):
         if location == Location.DEFAULT:
             data = ''
         else:
-            data = '<CreateBucketConstraint><LocationConstraint>' + \
-                    location + '</LocationConstraint></CreateBucketConstraint>'
+            data = '<CreateBucketConfiguration><LocationConstraint>' + \
+                    location + '</LocationConstraint></CreateBucketConfiguration>'
         response = self.make_request('PUT', bucket_name, headers=headers,
                 data=data)
         body = response.read()