Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Fri, 30 Apr 2010 20:23:23 +0000 (22:23 +0200)
committerFabian Groffen <grobian@gentoo.org>
Fri, 30 Apr 2010 20:23:23 +0000 (22:23 +0200)
commitb25d197e38a63a69dc548f58c17e99439a08dc86
treecd3e3a748f2f1b42e0bc60c2743eb496ed8fe203
parenta114f4c4a0b4c95a2ee720ee46748b8acf50a46f
parentcdb5a4554b9c73c6d4f32d0f20cb4157b77b6e71
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/emerge-webrsync
pym/portage/data.py
pym/portage/package/ebuild/doebuild.py
13 files changed:
bin/ebuild
bin/ebuild.sh
bin/emerge-webrsync
bin/isolated-functions.sh
man/emerge.1
pym/_emerge/Package.py
pym/_emerge/depgraph.py
pym/_emerge/main.py
pym/portage/const.py
pym/portage/data.py
pym/portage/dbapi/bintree.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/doebuild.py