Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Fri, 2 Apr 2010 18:47:51 +0000 (20:47 +0200)
committerFabian Groffen <grobian@gentoo.org>
Fri, 2 Apr 2010 18:47:51 +0000 (20:47 +0200)
commitf237f446c4705a707f6a355cd765fc84ee6ee6fa
tree39e462b244014c8a8c6191a2ea712415754d9d2e
parent206edf61d4f0261a9f305f1e57657a37800d912b
parentc85836b52122679100c84410be14b36123e36c99
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/quickpkg

copyright clashed with our @PORTAGE_PYTHON@ shebang
bin/isolated-functions.sh
bin/quickpkg
bin/repoman
pym/_emerge/actions.py
pym/_emerge/main.py
pym/portage/__init__.py