Index: debian/changelog
===================================================================
--- debian/changelog	(.../pool/current)	(revision 37688)
+++ debian/changelog	(.../trunk)	(revision 37688)
@@ -1,3 +1,9 @@
+debconf (1.4.72nexenta3) elatte; urgency=low
+
+  * upstream merge
+
+ -- Erast Benson <erast@gnusolaris.org>  Fri, 21 Apr 2006 09:34:48 -0700
+
 debconf (1.4.72ubuntu2) dapper; urgency=low
 
   * Backport from trunk:
Index: Debconf/FrontEnd/Dialog.pm
===================================================================
--- Debconf/FrontEnd/Dialog.pm	(.../pool/current)	(revision 37688)
+++ Debconf/FrontEnd/Dialog.pm	(.../trunk)	(revision 37688)
@@ -277,7 +277,7 @@
 	if (defined $this->info) {
 		$backtitle = $this->info->description;
 	} else {
-		$backtitle = gettext("Ubuntu Configuration");
+		$backtitle = gettext("Nexenta Configuration");
 	}
 
 	use vars qw{*INPUT_RDR *INPUT_WTR};
Index: Debconf/DbDriver/File.pm
===================================================================
--- Debconf/DbDriver/File.pm	(.../pool/current)	(revision 37688)
+++ Debconf/DbDriver/File.pm	(.../trunk)	(revision 37688)
@@ -100,7 +100,7 @@
 		# Now lock the file with flock locking. I don't wait on
 		# locks, just error out. Since I open a lexical filehandle,
 		# the lock is dropped when this object is destroyed.
-		flock($this->{_fh}, LOCK_EX | LOCK_NB) or
+		flock($this->{_fh}, LOCK_SH | LOCK_NB) or
 			$this->error("$this->{filename} is locked by another process");
 	}