Resolve conflict, bah
authorFabian Groffen <grobian@gentoo.org>
Fri, 2 Oct 2009 20:58:01 +0000 (20:58 -0000)
committerFabian Groffen <grobian@gentoo.org>
Fri, 2 Oct 2009 20:58:01 +0000 (20:58 -0000)
commitf0a3efc2f0a75dcd3e64e9da88bff34588ccefc9
treee2d14601228d90da65e351e74c4779310a2ded93
parent31c818a54eb8a0aca3a22db3e1f706c1fd54115b
Resolve conflict, bah

svn path=/main/branches/prefix/; revision=14475
pym/portage/versions.py