diff -Nru cloud-init-0.5.9/cloudinit/boto_utils.py cloud-init-0.5.10/cloudinit/boto_utils.py
--- cloud-init-0.5.9/cloudinit/boto_utils.py	2010-03-08 18:05:24.000000000 +0000
+++ cloud-init-0.5.10/cloudinit/boto_utils.py	2010-03-26 04:56:27.000000000 +0000
@@ -54,10 +54,10 @@
         except:
             pass
         #boto.log.exception('Caught exception reading instance data')
-        sys.stderr.write('Caught exception reading instance data')
+        sys.stderr.write('Caught exception reading instance data: %s\n' % url)
         time.sleep(2**i)
     #boto.log.error('Unable to read instance data, giving up')
-    sys.stderr.write('Caught exception reading instance data, giving up')
+    sys.stderr.write('Caught exception reading instance data, giving up\n')
     return ''
 
 def get_instance_metadata(version='latest'):
diff -Nru cloud-init-0.5.9/debian/changelog cloud-init-0.5.10/debian/changelog
--- cloud-init-0.5.9/debian/changelog	2010-03-26 05:24:24.000000000 +0000
+++ cloud-init-0.5.10/debian/changelog	2010-03-26 05:24:24.000000000 +0000
@@ -1,3 +1,12 @@
+cloud-init (0.5.10-0ubuntu1) lucid; urgency=low
+
+  * New upstream release.
+  * ec2-get-info: fix for python traceback
+  * ephemeral mount will show up in /etc/mtab or df on first boot
+    LP: #527825
+
+ -- Scott Moser <smoser@ubuntu.com>  Fri, 26 Mar 2010 00:57:28 -0400
+
 cloud-init (0.5.9-0ubuntu1) lucid; urgency=low
 
   * New upstream release.
diff -Nru cloud-init-0.5.9/ec2-get-info.py cloud-init-0.5.10/ec2-get-info.py
--- cloud-init-0.5.9/ec2-get-info.py	2010-03-08 18:05:24.000000000 +0000
+++ cloud-init-0.5.10/ec2-get-info.py	2010-03-26 04:56:27.000000000 +0000
@@ -61,7 +61,7 @@
     parser.add_option('--block-device', dest='block', action='store_true', help='Display the block device id.')
     parser.add_option('--instance-id', dest='id', action='store_true', help='Display the instance id.')
     parser.add_option('--instance-type', dest='type', action='store_true', help='Display the instance type.')
-        parser.add_option('--local-hostname', dest='lhostname', action='store_true', help='Display the local hostname.')
+    parser.add_option('--local-hostname', dest='lhostname', action='store_true', help='Display the local hostname.')
     parser.add_option('--local-ipv4', dest='lipv4', action='store_true', help='Display the local ipv4 IP address.')
     parser.add_option('--kernel-id', dest='aki', action='store_true', help='List the AKI.')
     parser.add_option('--product-codes', dest='code', action='store_true', help='List the product codes associated with thsi AMI.')
diff -Nru cloud-init-0.5.9/setup.py cloud-init-0.5.10/setup.py
--- cloud-init-0.5.9/setup.py	2010-03-08 18:05:24.000000000 +0000
+++ cloud-init-0.5.10/setup.py	2010-03-26 04:56:27.000000000 +0000
@@ -23,7 +23,7 @@
 import subprocess
 
 setup(name='cloud-init',
-      version='0.5.9',
+      version='0.5.10',
       description='EC2 initialisation magic',
       author='Scott Moser',
       author_email='scott.moser@canonical.com',
diff -Nru cloud-init-0.5.9/upstart/cloud-config-mounts.conf cloud-init-0.5.10/upstart/cloud-config-mounts.conf
--- cloud-init-0.5.9/upstart/cloud-config-mounts.conf	2010-03-08 18:05:24.000000000 +0000
+++ cloud-init-0.5.10/upstart/cloud-config-mounts.conf	2010-03-26 04:56:27.000000000 +0000
@@ -2,7 +2,7 @@
 #   includes enabling swap
 description "Setup mount points in fstab per config"
 
-start on cloud-config
+start on filesystem
 console output
 task