Merged from trunk 8510:8513

   Merged from trunk 8510:8513

   | 8511    | Bug #199311 - Make dblink.getcontents() show the path of the |
   | zmedico | CONTENTS file when any kind of parse error occurs.           |

   | 8512    | Don't export ${IMAGE} to the ebuild environment anymore      |
   | zmedico | since everything uses ${D} now (including the entire tree).  |

   | 8513    | Set IMAGE for minimal backward compatibility with overlays   |
   | zmedico | or user's bashrc, but don't export it.                       |

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