Pull in upstream boto from github at bcb719937de9ac2851e632d62b777352029a6d55

boto/ec2/elb/loadbalancer.py

Index: boto/ec2/elb/loadbalancer.py
diff --git a/boto/ec2/elb/loadbalancer.py b/boto/ec2/elb/loadbalancer.py
index 3c459c1cd006fdab6daeea9f406b90b6c774a943..df360ec27cd03f09d665aeef221adb62255f1e35 100644
--- a/boto/ec2/elb/loadbalancer.py
+++ b/boto/ec2/elb/loadbalancer.py
@@ -167,10 +167,8 @@ class LoadBalancer(object):
     def delete_listeners(self, listeners):
         return self.connection.delete_load_balancer_listeners(self.name, listeners)
 
-    def delete_listener(self, inPort, outPort=None, proto="tcp"):
-        if outPort == None:
-            outPort = inPort
-        return self.delete_listeners([(inPort, outPort, proto)])
+    def delete_listener(self, inPort):
+        return self.delete_listeners([inPort])
 
     def delete_policy(self, policy_name):
         """