Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sat, 18 Sep 2010 10:45:32 +0000 (12:45 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sat, 18 Sep 2010 10:45:32 +0000 (12:45 +0200)
Conflicts:
pym/portage/dbapi/vartree.py

1  2 
pym/portage/dbapi/vartree.py

Simple merge