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

Conflicts caused by copyright header change:
	bin/ebuild
	bin/egencache
	bin/emerge
	bin/portageq
	bin/repoman

diff --cc bin/ebuild
index e1d2ef16994013625d3f6444e9bbef09678f4acd,2c04200e7842a132a223bc58af751c30a86bfb77..541e7c9090bfe4b0d4afce830ca4d355b485d707
--- 1/bin/ebuild
--- 2/bin/ebuild
+++ b/bin/ebuild
@@@ -1,5 -1,5 +1,5 @@@
 -#!/usr/bin/python -O
 +#!@PREFIX_PORTAGE_PYTHON@ -O
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  from __future__ import print_function

diff --cc bin/ebuild.sh
Simple merge

diff --cc bin/egencache
index 89e407c2ba50c2a749af206bc3ca3b775fa7f74b,76dd900e7fb7ca36b48d29f8ab03264f3fc1e881..ec56ff3670d8010a7be4564a0ab641b348030aa0
--- 1/bin/egencache
--- 2/bin/egencache
+++ b/bin/egencache
@@@ -1,5 -1,5 +1,5 @@@
 -#!/usr/bin/python
 +#!@PREFIX_PORTAGE_PYTHON@
- # Copyright 2009-2010 Gentoo Foundation
+ # Copyright 2009-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  from __future__ import print_function

diff --cc bin/emerge
index 8d56c09295a63320841a1ddbf057d953bd46c94f,6f69244be90a168c5a9e0fe9bfecc9061464a586..324f67382246abdde5353ca7ef8a61c8e63f89fd
--- 1/bin/emerge
--- 2/bin/emerge
+++ b/bin/emerge
@@@ -1,5 -1,5 +1,5 @@@
 -#!/usr/bin/python
 +#!@PREFIX_PORTAGE_PYTHON@
- # Copyright 2006-2009 Gentoo Foundation
+ # Copyright 2006-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  from __future__ import print_function

diff --cc bin/emerge-webrsync
Simple merge

diff --cc bin/portageq
index 1fa290d74469bc0cd4df533accb032cf441e0976,2f254ca81d59a4ff4dbdce31c57fd9a2f917a5f2..e682e8304bda7036aa05ba4572f3daa95a1a4900
--- 1/bin/portageq
--- 2/bin/portageq
+++ b/bin/portageq
@@@ -1,5 -1,5 +1,5 @@@
 -#!/usr/bin/python -O
 +#!@PREFIX_PORTAGE_PYTHON@ -O
- # Copyright 1999-2006 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  from __future__ import print_function

diff --cc bin/repoman
index 2e976f2338bdc149fe265382fbe21d9b21a73018,60c69fb599812153b99f89391c2473166687e4b5..d87e23a0a5c7288abc07e904e56d83d3847d12ec
--- 1/bin/repoman
--- 2/bin/repoman
+++ b/bin/repoman
@@@ -1,5 -1,5 +1,5 @@@
 -#!/usr/bin/python -O
 +#!@PREFIX_PORTAGE_PYTHON@ -O
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  # Next to do: dep syntax checking in mask files

diff --cc pym/_emerge/EbuildBuild.py
Simple merge

diff --cc pym/_emerge/actions.py
Simple merge

diff --cc pym/_emerge/main.py
Simple merge

diff --cc pym/portage/dbapi/vartree.py
Simple merge

diff --cc pym/portage/package/ebuild/doebuild.py
Simple merge