Merged from trunk -r13663:13666

   Merged from trunk -r13663:13666

   | 13664   | Fix imports broken by splitting of _emerge/__init__.py.      |
   | zmedico |                                                              |

   | 13665   | Use lazy imports for submodules where possible.              |
   | zmedico |                                                              |

   | 13666   | Revert lazy imports from r13665 for now, since pyflakes      |
   | zmedico | doesn't understand them, and pyflakes helps check stuff      |
   |         | while we're splitting this file up.                          |

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