diff -u gnupg2-2.0.4/debian/changelog gnupg2-2.0.4/debian/changelog
--- gnupg2-2.0.4/debian/changelog
+++ gnupg2-2.0.4/debian/changelog
@@ -1,3 +1,9 @@
+gnupg2 (2.0.4-1ubuntu4) gutsy; urgency=low
+
+  * g10/keyedit.c: changed "an user" in "a user" (LP: #135238)
+
+ -- Andrea Colangelo <warp10@libero.it>  Sat, 03 Nov 2007 14:27:12 +0100
+
 gnupg2 (2.0.4-1ubuntu3) gutsy; urgency=low
 
   * Rebuild for the libcurl transition mess.
only in patch2:
unchanged:
--- gnupg2-2.0.4.orig/g10/keyedit.c
+++ gnupg2-2.0.4/g10/keyedit.c
@@ -2098,7 +2098,7 @@
 	    if(opt.trust_model==TM_EXTERNAL)
 	      {
 		tty_printf(_("Owner trust may not be set while "
-			     "using an user provided trust database\n"));
+			     "using a user provided trust database\n"));
 		break;
 	      }