merge with trunk rev 2915:2020
authorKito <kito@gentoo.org>
Fri, 17 Mar 2006 22:18:56 +0000 (22:18 -0000)
committerKito <kito@gentoo.org>
Fri, 17 Mar 2006 22:18:56 +0000 (22:18 -0000)
commit8c97a70bdc426169f60cbdcf0d68ceb185fe3857
treef0bfd79d37d6806cf22ea763e04b820243e4920c
parentdd7a1ca579445d813545e56706bf57d419bde625
merge with trunk rev 2915:2020

svn path=/main/branches/prefix/; revision=2921
pym/portage.py
pym/portage_util.py