Merged from trunk -r12552:12556

   Merged from trunk -r12552:12556

   | 12553   | Inside fetch(), only mention /var/log/emerge-fetch.log in    |
   | zmedico | locking messages when called by emerge.                      |

   | 12554   | Remove the emerge-fetch.log lock message code from fetch()   |
   | zmedico | since this is handled by the EbuildBuild class when it       |
   |         | synchronizes with the prefetcher.                            |

   | 12555   | Add messages before and after the src_prepare phase. Thanks  |
   | zmedico | to Arfrever for this patch.                                  |

   | 12556   | Fix die() usage in ebuild phase examples. Thanks to Jeremy   |
   | zmedico | Olexa <darkside@g.o> for this patch.                         |

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