Merged from trunk -r13103:13131

   Merged from trunk -r13103:13131

   | 13104    | Add missing brackets to [:upper:] and [:lower:] in          |
   | zmedico  | _sb_append_var() tr arguments.                              |

   | 13108    | Tweak grammar.                                              |
   | zmedico  |                                                             |

   | 13109    | Bug #262365 - Make the "portage.internal" category          |
   | zmedico  | (prepalldocs check) a warning instead of fatal.             |

   | 13113    | Add make.conf for amd64-fbsd submitted by Timothy Redaelli  |
   | zmedico  | <drizzt@g.o>.                                               |

   | 13114    | add m68k diff from kolla                                    |
   | SpankMan |                                                             |

   | 13115    | Do not create hardlinks when merging CONFIG_PROTECTed files |
   | zmedico  | since config files shouldn't be hardlinked to eachother     |
   |          | (for example, shadow installs several identical config      |
   |          | files inside /etc/pam.d/). Thanks to Caleb Cushing          |
   |          | <xenoterracide@gmail.com> for reporting.                    |

   | 13116    | Bug #262485 - Handle InvalidAtom from dep_expand().         |
   | zmedico  |                                                             |

   | 13117    | Punt fix-db.py since it's not really needed. It's been      |
   | zmedico  | broken since 2.1.6 and nobody noticed until bug #262132 was |
   |          | filed.                                                      |

   | 13118    | Bug #262365 - Punt the prepalldocs check until there is an  |
   | zmedico  | alternative available in EAPI 3.                            |

   | 13119    | Remove portage.internal docs (goes with previous commit).   |
   | zmedico  |                                                             |

   | 13126    | Validate argument atoms earlier for build actions.          |
   | zmedico  |                                                             |

   | 13130    | In order to avoid possible duplicate elog messages when     |
   | zmedico  | using ebuild(1) to call the same phase multiple times, wipe |
   |          | out elog log files for the current phase just before        |
   |          | executing the phase. Thanks to Mike Frysinger <vapier@g.o>  |
   |          | for reporting.                                              |

   | 13131    | Update copyright headers.                                   |
   | zmedico  |                                                             |

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