Merged from trunk -r12367:12371

   Merged from trunk -r12367:12371

   | 12368   | Handle tree conflicts in svn status output, new in           |
   | zmedico | subversion 1.6. Thanks to Arfrever Frehtes Taifersar         |
   |         | Arahesis for reporting.                                      |

   | 12369   | Bug #252995 - When post_emerge() returns early because the   |
   | zmedico | vdb state has not changed, still display new notifications.  |

   | 12370   | Bug #252985 - Add a note about the new default behavior for  |
   | zmedico | `emerge world` and `emerge system` commands.                 |

   | 12371   | Bug #253210 - Fix logic inside EbuildBuild._buildpkg_exit()  |
   | zmedico | to avoid triggering an AssertionError when the package phase |
   |         | has failed. This bug usually isn't noticeable since the      |
   |         | package phase usually succeeds.                              |

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