Merging in latest boto.

boto/ec2/address.py

Index: boto/ec2/address.py
diff --git a/boto/ec2/address.py b/boto/ec2/address.py
index 60ed40675f11e9b8112fcebc5692241da918996a..770a90429a0e7f86365470cdea67d2e949940796 100644
--- a/boto/ec2/address.py
+++ b/boto/ec2/address.py
@@ -14,7 +14,7 @@
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
 # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
@@ -26,12 +26,15 @@ Represents an EC2 Elastic IP Address
 from boto.ec2.ec2object import EC2Object
 
 class Address(EC2Object):
-    
+
     def __init__(self, connection=None, public_ip=None, instance_id=None):
         EC2Object.__init__(self, connection)
         self.connection = connection
         self.public_ip = public_ip
         self.instance_id = instance_id
+        self.domain = None
+        self.allocation_id = None
+        self.association_id = None
 
     def __repr__(self):
         return 'Address:%s' % self.public_ip
@@ -41,6 +44,12 @@ class Address(EC2Object):
             self.public_ip = value
         elif name == 'instanceId':
             self.instance_id = value
+        elif name == 'domain':
+            self.domain = value
+        elif name == 'allocationId':
+            self.allocation_id = value
+        elif name == 'associationId':
+            self.association_id = value
         else:
             setattr(self, name, value)
 
@@ -55,4 +64,4 @@ class Address(EC2Object):
     def disassociate(self):
         return self.connection.disassociate_address(self.public_ip)
 
-    
+