Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Thu, 27 May 2010 18:00:17 +0000 (20:00 +0200)
committerFabian Groffen <grobian@gentoo.org>
Thu, 27 May 2010 18:00:17 +0000 (20:00 +0200)
commit5914c0578bbcc9aeaaf77209cc75af2c003f63be
tree5572b437ae3a3f117db962522e384444e5d85081
parentf255b9c2c75141757b5f68b1daf9ecb4302e769f
parenta05bba76435d94407fd25549d0552902962baf62
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild.sh
bin/ebuild.sh
bin/misc-functions.sh
man/emerge.1
pym/_emerge/Package.py
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/_emerge/main.py