Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Mon, 20 Sep 2010 15:20:35 +0000 (17:20 +0200)
committerFabian Groffen <grobian@gentoo.org>
Mon, 20 Sep 2010 15:20:35 +0000 (17:20 +0200)
commitcdc87f479d460b84fafd6b81a4647bb8c9e095f8
tree9a947076f23ff33a66587a6da4a1eb2a21da53e2
parent63d7e91e6ea1ed2248de6a6889feadcebb6ba303
parentd54430b4c2d2191d051930925e6029ec22c19baf
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
pym/_emerge/RepoDisplay.py
pym/_emerge/depgraph.py