Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sun, 13 Mar 2011 14:42:58 +0000 (15:42 +0100)
committerFabian Groffen <grobian@gentoo.org>
Sun, 13 Mar 2011 14:42:58 +0000 (15:42 +0100)
commit0e8dc4226bf5bad8ade819aa5282ec6aca01f220
treea6fdaa183a6d13bb880716c2426983f369bed7b1
parent5fe6f8c536460d74097aa1b10eeffe115382fa03
parentdf2638070b38577d23947c40595af058e7b75abd
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild-ipc.py
bin/ebuild-ipc.py
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/doebuild.py