Merged from trunk -r11776:11784

   Merged from trunk -r11776:11784

   | 11777   | Rename "object" variable to avoid name collision with the    |
   | zmedico | builtin class.                                               |

   | 11778   | Before returning from PreservedLibsRegistry.store(), update  |
   | zmedico | self._data_orig.                                             |

   | 11779   | Explicitly load the preserved libs registry after obtaining  |
   | zmedico | a lock for merge or unmerge, in case the registry has been   |
   |         | changed by a parallel emerge instance.                       |

   | 11780   | Also call PreservedLibsRegistry.pruneNonExisting() after     |
   | zmedico | obtaining a lock and loading it for merge or unmerge.        |

   | 11781   | Remove unnecessary handler for plain "Exception" from        |
   | zmedico | lstat() call in dblink.mergeme().                            |

   | 11782   | * In fetch(), ensure that pkg_nofetch is never called more   |
   | zmedico | than once. * In _validate_deps(), revert back to using       |
   |         | aux_get since the config instance does not cache SRC_URI.    |

   | 11783   | Remove broken pickle_write() since it can't possibly be      |
   | zmedico | used.                                                        |

   | 11784   | When echoing the emake command, redirect to stderr since     |
   | zmedico | otherwise it breaks the gcc ebuild because of the way that   |
   |         | the get_make_var() function from toolchain.eclass is used.   |

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