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

Conflicts:
	bin/ebuild-ipc.py

diff --cc bin/ebuild-ipc.py
index 786f4a7668b5426057760f6be4d735f15a05e630,d8e7e55129c24cb2899891ac312dc046adee26bf..761b695ae60dffe3eda5c375e48e9bed296f64df
--- 1/bin/ebuild-ipc.py
--- 2/bin/ebuild-ipc.py
+++ b/bin/ebuild-ipc.py
@@@ -1,5 -1,5 +1,5 @@@
 -#!/usr/bin/python
 +#!@PREFIX_PORTAGE_PYTHON@
- # Copyright 2010 Gentoo Foundation
+ # Copyright 2010-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  #
  # This is a helper which ebuild processes can use

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

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