From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 2 Apr 2010 18:47:51 +0000 (+0200)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f237f446c4705a707f6a355cd765fc84ee6ee6fa;p=portage.git

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

Conflicts:
	bin/quickpkg

copyright clashed with our @PORTAGE_PYTHON@ shebang
---

f237f446c4705a707f6a355cd765fc84ee6ee6fa
diff --cc bin/quickpkg
index 2b177e759,8e74c2c34..d29118f1e
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@@ -1,5 -1,5 +1,5 @@@
 -#!/usr/bin/python
 +#!@PORTAGE_PYTHON@
- # Copyright 1999-2007 Gentoo Foundation
+ # Copyright 1999-2010 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  from __future__ import print_function