Merge with trunk - r2616:2636
authorKito <kito@gentoo.org>
Sun, 5 Feb 2006 04:07:14 +0000 (04:07 -0000)
committerKito <kito@gentoo.org>
Sun, 5 Feb 2006 04:07:14 +0000 (04:07 -0000)
commit7c17de14d42f6b352899879f367ec3b95de8ba57
treee6cfad4ed86ff5b0e79804c1d48c4f06bdad606a
parent82dd49e573a59ab79fa70e6578a8158c58aca34b
Merge with trunk - r2616:2636

svn path=/main/branches/prefix/; revision=2661
21 files changed:
NEWS
bin/ebuild.sh
bin/emerge
bin/emerge-webrsync
bin/prepallinfo
bin/prepallman
bin/prepallstrip
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
man/make.conf.5
pym/portage.py