Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Fri, 7 Jan 2011 07:58:12 +0000 (08:58 +0100)
committerFabian Groffen <grobian@gentoo.org>
Fri, 7 Jan 2011 07:58:12 +0000 (08:58 +0100)
commit6f55cca94aac89374bb7de8fe906761152bf7f68
tree5f4c4569c1092419bb3eb560b34f92a27830b61d
parent8e56e9ac397f243f1552917dd10949b4d0e6c7be
parentb9c572d6706d172fd0aaed9492dbb3fbee0700b8
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/emerge-webrsync
pym/_emerge/depgraph.py
bin/emerge-webrsync
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/_emerge/main.py