merge with trunk rev 2947:2966
authorKito <kito@gentoo.org>
Mon, 20 Mar 2006 21:12:29 +0000 (21:12 -0000)
committerKito <kito@gentoo.org>
Mon, 20 Mar 2006 21:12:29 +0000 (21:12 -0000)
commit581e83296bf0f0cd43f81f087382bb2378070167
treeee1c7ba871d8fff89fb3f11c811cb3ea799e9ccd
parentaf40b0567ebf264a56814f5b44b8027d437e4926
merge with trunk rev 2947:2966

svn path=/main/branches/prefix/; revision=2967
25 files changed:
NEWS
RELEASE-NOTES
bin/ebuild.sh
bin/emerge
bin/emerge-webrsync
bin/isolated-functions.sh
bin/repoman
cnf/make.conf
cnf/make.conf.alpha
cnf/make.conf.amd64
cnf/make.conf.arm
cnf/make.conf.hppa
cnf/make.conf.ia64
cnf/make.conf.mac [deleted file]
cnf/make.conf.mips
cnf/make.conf.ppc
cnf/make.conf.ppc64
cnf/make.conf.s390
cnf/make.conf.sparc
cnf/make.conf.x86
cnf/make.conf.x86-fbsd
cnf/make.globals
man/make.conf.5
pym/portage.py
pym/portage_util.py