Merged from trunk -r14950:14963

   Merged from trunk -r14950:14963

   | 14951   | Fix possibly unsafe modification of list during iteration    |
   | zmedico | inside update_config_files().                                |

   | 14953   | Inside dblink._merge(), make sure PORTAGE_BUILDDIR still     |
   | zmedico | exists before trying to call ebuild success/die hooks, since |
   |         | it might have already been removed by fail-clean (and the    |
   |         | hooks would have already been called).                       |

   | 14955   | Make more code conditional on existence of PORTAGE_BUILDDIR  |
   | zmedico | inside dblink._merge().                                      |

   | 14957   | Remove unnecessary elog_process() phasefilter arguements.    |
   | zmedico |                                                              |

   | 14958   | Remove unused filter_phases, filter_mergephases, and         |
   | zmedico | filter_unmergephases functions.                              |

   | 14963   | Copy the unittest._TextTestResult class from python-2.6      |
   | zmedico | since it's been removed in python-2.7.                       |

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