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

Conflicts:
	bin/quickpkg

copyright clashed with our @PORTAGE_PYTHON@ shebang

diff --cc bin/isolated-functions.sh
Simple merge

diff --cc bin/quickpkg
index 2b177e75959284070e507024305ecea235073ba7,8e74c2c346fcbe5d742f88042ae0e9821fae2024..d29118f1edabf933bdefb1176db0c9f075c113f3
--- 1/bin/quickpkg
--- 2/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

diff --cc bin/repoman
Simple merge

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

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

diff --cc pym/portage/__init__.py
Simple merge