diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index a8c9a87bb164da39f21c41a646011fd78281b7d8..8e5667ffb772eb654a5ce7507b7ad70a72f4fb72 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.429 2008/01/01 19:45:54 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.430 2008/01/14 19:18:53 tgl Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -4829,6 +4829,16 @@ GUC_complaint_elevel(GucSource source)
 		 */
 		elevel = IsUnderPostmaster ? DEBUG3 : LOG;
 	}
+	else if (source == PGC_S_OVERRIDE)
+	{
+		/*
+		 * If we're a postmaster child, this is probably "undo" during
+		 * transaction abort, so we don't want to clutter the log.  There's
+		 * a small chance of a real problem with an OVERRIDE setting,
+		 * though, so suppressing the message entirely wouldn't be desirable.
+		 */
+		elevel = IsUnderPostmaster ? DEBUG5 : LOG;
+	}
 	else if (source < PGC_S_INTERACTIVE)
 		elevel = LOG;
 	else