Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sat, 13 Nov 2010 19:36:37 +0000 (20:36 +0100)
committerFabian Groffen <grobian@gentoo.org>
Sat, 13 Nov 2010 19:36:37 +0000 (20:36 +0100)
commit5b7bfaf0eb80f28c21ca9a1e29464ac5a20d558f
treed2a15b81aad2c61462df0c4ff91361d769867de2
parent11eb69328084d185ff5e3d5aa99d74c2f7b58c25
parentf456171f1fee81734b5e214488c8b86bec842d1a
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
pym/portage/dbapi/vartree.py
bin/regenworld
bin/repoman
pym/portage/dbapi/vartree.py