Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Tue, 30 Aug 2011 18:44:43 +0000 (20:44 +0200)
committerFabian Groffen <grobian@gentoo.org>
Tue, 30 Aug 2011 18:44:43 +0000 (20:44 +0200)
1  2 
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/doebuild.py

Simple merge