Merged from trunk 8085:8102

   Merged from trunk 8085:8102

   | 8086    | Bug #195527 - Unconditionally detect file collisions and log |
   | zmedico | them as eerror messages via elog. This will allow us to      |
   |         | collect more file collision data but it won't be quite as    |
   |         | annoying as enabling collision-protect by default would be.  |

   | 8087    | Bug #195527 - Add some more information to the file          |
   | zmedico | collision eerror message to try and prevent user confusion:  |
   |         | - Hint that `equery belongs ` can be used to find the        |
   |         | installed package that owns a file. - Advise then NOT to     |
   |         | file a bug without reporting exactly which two packages      |
   |         | install the same file(s).                                    |

   | 8089    | s:this package wants:this package will:                      |
   | zmedico |                                                              |

   | 8091    | Remove a redundant call to elog_process().                   |
   | zmedico |                                                              |

   | 8093    | Bug #195370 - Filter some more bogus matches due to          |
   | zmedico | old-style virtuals.                                          |

   | 8096    | In dblink.treewalk(), use os.walk() instead of               |
   | zmedico | portage.listdir() in order to avoid cacheddir() bloat when   |
   |         | listing the files to be merged from ${D}.                    |

   | 8097    | Use os.listdir() instead of portage.listdir() in             |
   | zmedico | dblink.mergeme().                                            |

   | 8098    | Remove a chdir() call that's no longer needed for the        |
   | zmedico | collision-protect symlink code.                              |

   | 8100    | Make the file collision eerror message less verbose when in  |
   | zmedico | --quiet mode.                                                |

   | 8102    | Handle the PortageException that can be raised from          |
   | zmedico | portage.mail.send_mail().                                    |

svn path=/main/branches/prefix/; revision=8106