Merged from trunk -r13909:13919

   Merged from trunk -r13909:13919

   | 13910   | Avoid UnicodeEncodeError with unicode package.mask comments. |
   | zmedico | Thanks to Thanks to Scott Moreau (soreau) for reporting.     |

   | 13911   | Fix bindbapi.aux_get and aux_update to work with             |
   | zmedico | py3k/unicode.                                                |

   | 13912   | Open all files in binary mode for py3k compatibility.        |
   | zmedico |                                                              |

   | 13913   | Open file in text mode (unicode) where appropriate.          |
   | zmedico |                                                              |

   | 13914   | In _check_build_log(), open the log in text mode (unicode).  |
   | zmedico |                                                              |

   | 13915   | Open ld.so.conf as text (unicode).                           |
   | zmedico |                                                              |

   | 13916   | Fix the FEATURES=parse-eapi-ebuild-head regex to handle      |
   | zmedico | comments on the same line, like this: EAPI=2 #foo Thanks to  |
   |         | Markus Meier <maekke@gentoo.org> for reporting.              |

   | 13917   | s/utf8/utf_8/ for consistency                                |
   | zmedico |                                                              |

   | 13919   | Fix insert_optional_args() to properly handle thinks like    |
   | zmedico | -Dk which require multiple substitutions of default          |
   |         | arguments.                                                   |

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