Merge with trunk - 2584:2616
authorKito <kito@gentoo.org>
Wed, 1 Feb 2006 17:44:20 +0000 (17:44 -0000)
committerKito <kito@gentoo.org>
Wed, 1 Feb 2006 17:44:20 +0000 (17:44 -0000)
commit7c8f4b4648b71b4fbee2bf687f63a56040c0bd07
tree42fd189e752b8d34e97aaec1fbfa5f0113e235d3
parent7a81e85ddb2dcb03d29d623b43ffa856383be299
Merge with trunk - 2584:2616

svn path=/main/branches/prefix/; revision=2617
26 files changed:
RELEASE-NOTES
bin/ebuild.sh
bin/emaint
bin/emerge
bin/env-update
bin/prepstrip
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.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
man/emerge.1
man/make.conf.5
man/portage.5
pym/emergehelp.py
pym/portage.py
pym/portage_dep.py