From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-572443-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 28C8C138010
	for <garchives@archives.gentoo.org>; Sun, 24 Mar 2013 08:37:00 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id BEC2EE0781;
	Sun, 24 Mar 2013 08:36:58 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 51FEBE0781
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 Mar 2013 08:36:58 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 65E1033BEB1
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 Mar 2013 08:36:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 05BA0E4073
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 Mar 2013 08:36:55 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org>
Message-ID: <1364114203.04898da141c706f24d1303f2ecf62163fc7808ed.grobian@gentoo>
Subject: [gentoo-commits] proj/portage:prefix commit in: /
X-VCS-Repository: proj/portage
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: 04898da141c706f24d1303f2ecf62163fc7808ed
X-VCS-Branch: prefix
Date: Sun, 24 Mar 2013 08:36:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: b672511e-e081-4fcd-bbc6-99ba292ef7ba
X-Archives-Hash: 029e36a3f77875bede5a91e1356dee5e

commit:     04898da141c706f24d1303f2ecf62163fc7808ed
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 08:36:43 2013 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 08:36:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=04898da1

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	pym/_emerge/SpawnProcess.py


 man/ebuild.5                |    4 ++--
 pym/_emerge/SpawnProcess.py |   13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)