Merged from trunk -r614{7,8}
authorFabian Groffen <grobian@gentoo.org>
Sat, 3 Mar 2007 11:37:00 +0000 (11:37 -0000)
committerFabian Groffen <grobian@gentoo.org>
Sat, 3 Mar 2007 11:37:00 +0000 (11:37 -0000)
commit1d1d44935ab2c364dd20c172997021ad11aab8f7
tree2023a00f923e76fc5db1bc92e804c38d6191da44
parentb5ccd3faf70fe14ad18ead5ecca594b1e7714d40
Merged from trunk -r614{7,8}

Make sure that excess "nomerge" nodes are pruned correctly.

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