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

Conflicts:
	bin/ebuild-helpers/doinfo

diff --cc bin/ebuild
Simple merge

diff --cc bin/ebuild-helpers/doinfo
index bae3e195a1d7faf744f19b506fd7546d47ce232a,96413aa6a9c7801d83ad56cea4f7fafd9745b6a6..51f8a1d1d64e116bac057e81e7ed3e113c117acf
--- 1/bin/ebuild-helpers/doinfo
--- 2/bin/ebuild-helpers/doinfo
+++ b/bin/ebuild-helpers/doinfo
@@@ -1,7 -1,9 +1,9 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2007 Gentoo Foundation
+ # Copyright 1999-2010 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
+ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+ 
  if [[ -z $1 ]] ; then
        vecho "${0##*/}: at least one argument needed"
        exit 1  

diff --cc bin/ebuild-helpers/doman
Simple merge

diff --cc pym/portage/tests/runTests
Simple merge