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)
commita6399eeab533438e291784696afe6a993bae45f1
tree6c64f04e6ac9ef334d3bfa6c4b7c955aa4c6443e
parent6ab7e86d2c4f3fca51f7ae29b51b506135f2f433
parente1bd015bebf5820ab7e1661b82342bd6f07027fe
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
pym/portage/dbapi/vartree.py
pym/portage/dbapi/vartree.py