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

Conflicts:
	pym/portage/data.py

diff --cc bin/egencache
Simple merge

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

diff --cc bin/phase-helpers.sh
Simple merge

diff --cc bin/repoman
Simple merge

diff --cc bin/save-ebuild-env.sh
Simple merge

diff --cc cnf/make.conf
Simple merge

diff --cc man/emerge.1
Simple merge

diff --cc man/make.conf.5
Simple merge

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

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

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

diff --cc pym/portage/data.py
index 23734f4ea93ad82c15c458768bd7e475df1da065,b922ff8e9939b3fae6971a68b806f7cde1387785..df87b5c8133e01d6dd5db284f77fdeb3977087ec
--- 1/pym/portage/data.py
--- 2/pym/portage/data.py
+++ b/pym/portage/data.py
@@@ -1,9 -1,8 +1,9 @@@
  # data.py -- Calculated/Discovered Data Values
- # Copyright 1998-2011 Gentoo Foundation
+ # Copyright 1998-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
- import os, pwd, grp, platform
+ import os, pwd, grp, platform, sys
 +from portage.const import PORTAGE_GROUPNAME, PORTAGE_USERNAME, EPREFIX
  
  import portage
  portage.proxy.lazyimport.lazyimport(globals(),

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

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

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