diff -Nru apport-2.5.1/.bzr-builddeb/default.conf apport-2.5.1/.bzr-builddeb/default.conf
--- apport-2.5.1/.bzr-builddeb/default.conf	2012-05-21 20:09:53.000000000 +0000
+++ apport-2.5.1/.bzr-builddeb/default.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[BUILDDEB]
-merge = True
diff -Nru apport-2.5.1/.bzrignore apport-2.5.1/.bzrignore
--- apport-2.5.1/.bzrignore	2012-05-21 20:09:53.000000000 +0000
+++ apport-2.5.1/.bzrignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-apport/packaging_impl.py
-debhelper/dh_apport.1
-doc/*.aux
-doc/*.log
-doc/*.pdf
-doc/*.toc
-build
-dist
-MANIFEST
diff -Nru apport-2.5.1/data/general-hooks/ubuntu.py apport-2.5.1/data/general-hooks/ubuntu.py
--- apport-2.5.1/data/general-hooks/ubuntu.py	2012-08-28 15:54:54.000000000 +0000
+++ apport-2.5.1/data/general-hooks/ubuntu.py	2012-08-30 21:08:07.000000000 +0000
@@ -337,7 +337,7 @@
         except:
             ami = None
 
-        if ami and ami.startswith('ami'):
+        if ami and ami.startswith(b'ami'):
             add_tag(report, 'ec2-images')
             fields = {'Ec2AMIManifest': 'ami-manifest-path',
                       'Ec2Kernel': 'kernel-id',
diff -Nru apport-2.5.1/debian/bzr-builddeb.conf apport-2.5.1/debian/bzr-builddeb.conf
--- apport-2.5.1/debian/bzr-builddeb.conf	1970-01-01 00:00:00.000000000 +0000
+++ apport-2.5.1/debian/bzr-builddeb.conf	2012-08-30 20:34:52.000000000 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+native = True
diff -Nru apport-2.5.1/debian/changelog apport-2.5.1/debian/changelog
--- apport-2.5.1/debian/changelog	2012-08-28 16:13:54.000000000 +0000
+++ apport-2.5.1/debian/changelog	2012-08-30 21:15:04.000000000 +0000
@@ -1,3 +1,9 @@
+apport (2.5.1-0ubuntu4) quantal; urgency=low
+
+  * do not stack trace when ec2 metadata is available (LP: #1018552)
+
+ -- Scott Moser <smoser@ubuntu.com>  Thu, 30 Aug 2012 17:15:02 -0400
+
 apport (2.5.1-0ubuntu3) quantal; urgency=low
 
   * data/general/ubuntu.py: when creating a duplicate signature search the