manually merge differences with the trunk
authorFabian Groffen <grobian@gentoo.org>
Mon, 12 May 2008 19:21:33 +0000 (19:21 -0000)
committerFabian Groffen <grobian@gentoo.org>
Mon, 12 May 2008 19:21:33 +0000 (19:21 -0000)
commit2579aa8efc16bf5dc66004d36840185332351c8f
tree3028fb2e1121629357fc5ff2d6e29024150af088
parent9320aa925455dda6392d1d5bc9b6105274ae3447
manually merge differences with the trunk

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