From 4688f15f215f2d09a52238f059eca56761aaa014 Mon Sep 17 00:00:00 2001
From: Marius Mauch <genone@gentoo.org>
Date: Sat, 10 Jun 2006 21:40:40 +0000
Subject: make elog mail module always set the 'From' header for rfc2822
 compliance

svn path=/main/trunk/; revision=3483
---
 bin/pkgmerge.new | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/pkgmerge.new')

diff --git a/bin/pkgmerge.new b/bin/pkgmerge.new
index 8795fc6cf..80c70ab10 100755
--- a/bin/pkgmerge.new
+++ b/bin/pkgmerge.new
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/pkgmerge.new,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id$
 
 import os,string,sys
 sys.path = ["/usr/lib/portage/pym"]+sys.path
-- 
cgit v1.2.3-1-g7c22