=== modified file 'apport/hookutils.py'
--- apport/hookutils.py	2011-07-14 16:13:38 +0000
+++ apport/hookutils.py	2011-07-20 16:36:13 +0000
@@ -80,7 +80,7 @@
             key += '_'
     report[key] = read_file(path)
 
-def attach_conffiles(report, package, conffiles=None):
+def attach_conffiles(report, package, conffiles=None, ui=None):
     '''Attach information about any modified or deleted conffiles'''
 
     try:
@@ -111,7 +111,14 @@
             calculated_md5sum = m.hexdigest()
 
             if calculated_md5sum != default_md5sum:
-                report[key] = contents
+                if ui:
+                    response = ui.yesno("It seems you have modified the contents of '%s'.  Would you like to add the contents of it to your bug report?" % path)
+                    if response:
+                        report[key] = contents
+                    else:
+                        report[key] = '[modified]'
+                else:
+                    report[key] = '[modified]'
                 statinfo = os.stat(path)
                 mtime = datetime.datetime.fromtimestamp(statinfo.st_mtime)
                 mtime_key = 'mtime.conffile.' + path_to_key(path)

=== modified file 'data/general-hooks/ubuntu.py'
--- data/general-hooks/ubuntu.py	2011-07-20 05:01:57 +0000
+++ data/general-hooks/ubuntu.py	2011-07-20 16:36:13 +0000
@@ -18,7 +18,7 @@
 from apport.hookutils import *
 from apport import unicode_gettext as _
 
-def add_info(report):
+def add_info(report, ui):
     add_release_info(report)
 
     add_kernel_info(report)
@@ -61,7 +61,7 @@
     if 'Package' in report:
         package = report['Package'].split()[0]
         if package and 'attach_conffiles' in dir():
-            attach_conffiles(report, package)
+            attach_conffiles(report, package, ui)
 
         # do not file bugs against "upgrade-system" if it is not installed (LP#404727)
         if package == 'upgrade-system' and 'not installed' in report['Package']:

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-20 05:01:57 +0000
+++ debian/changelog	2011-07-20 16:36:13 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 apport (1.21.2-0ubuntu6) UNRELELASED; urgency=low
 
   * data/general-hooks/ubuntu.py:
@@ -7,6 +8,16 @@
 
  -- Brian Murray <brian@ubuntu.com>  Tue, 19 Jul 2011 13:01:37 -0700
 
+=======
+apport (1.21.2-0ubuntu6) oneiric; urgency=low
+
+  * apport/hookutils.py:
+    - raise a yes no dialog in the event a conffile has been modified
+      (LP: #811203)
+
+ -- Brian Murray <brian@ubuntu.com>  Tue, 19 Jul 2011 15:10:21 -0700
+
+>>>>>>> MERGE-SOURCE
 apport (1.21.2-0ubuntu5) oneiric; urgency=low
 
   * data/general-hooks/ubuntu.py: