bad svn for not barking at me for checking in conflicts
authorFabian Groffen <grobian@gentoo.org>
Wed, 24 Jun 2009 08:45:19 +0000 (08:45 -0000)
committerFabian Groffen <grobian@gentoo.org>
Wed, 24 Jun 2009 08:45:19 +0000 (08:45 -0000)
commit148afd3096e1ec325d10005994124a585a897151
tree0443cc853a6041224b4e915f9b7b586aa6d3a9ee
parent9bba471fd544662c5c96c1d9e26b8747634f582b
bad svn for not barking at me for checking in conflicts

svn path=/main/branches/prefix/; revision=13683
pym/_emerge/__init__.py