Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Tue, 14 Jun 2011 15:37:40 +0000 (17:37 +0200)
committerFabian Groffen <grobian@gentoo.org>
Tue, 14 Jun 2011 15:37:40 +0000 (17:37 +0200)
commitebe76c40c60e1938493e87a4e690cc2615ebba79
treeb2847f46c81476e9b1f56672a86b27587f7b6fde
parent09b931e2e6f99898a0381a04543344b28213833f
parentcbdf030c3a61eaf323faff8f25e23989efb70248
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild.sh
pym/portage/dbapi/bintree.py
bin/ebuild.sh
pym/_emerge/depgraph.py
pym/portage/__init__.py
pym/portage/dbapi/bintree.py
pym/portage/package/ebuild/config.py
pym/portage/util/__init__.py