Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Wed, 15 Dec 2010 18:01:26 +0000 (19:01 +0100)
committerFabian Groffen <grobian@gentoo.org>
Wed, 15 Dec 2010 18:01:26 +0000 (19:01 +0100)
1  2 
bin/etc-update
pym/portage/dbapi/vartree.py
pym/portage/util/__init__.py

diff --cc bin/etc-update
Simple merge
Simple merge
Simple merge