Resolve merge error.
authorFabian Groffen <grobian@gentoo.org>
Tue, 9 Oct 2007 20:03:46 +0000 (20:03 -0000)
committerFabian Groffen <grobian@gentoo.org>
Tue, 9 Oct 2007 20:03:46 +0000 (20:03 -0000)
commitb4d457e1b46412525c13579f16264a0d6359f036
tree2ed9495452861419cf02c0889fe59bb60ea55ffd
parent3e1de40e26e28869d31f62e5ab33c5ad240e28bf
Resolve merge error.

svn path=/main/branches/prefix/; revision=8027
pym/emerge/__init__.py