Merged from trunk -r14008:14018

   Merged from trunk -r14008:14018

   | 14009   | Use _unicode_encode() where appropriate.                     |
   | zmedico |                                                              |

   | 14010   | Call _ensure_default_encoding() ASAP since writemsg() might  |
   | zmedico | not work without it.                                         |

   | 14011   | Use _unicode_encode() and _unicode_decode() where            |
   | zmedico | appropriate.                                                 |

   | 14012   | Bug #281133 - Fix the here-document code inside run_checks() |
   | zmedico | to properly detect the end of a here-document when it is     |
   |         | indented by whitespace.                                      |

   | 14013   | Use r'' for regex.                                           |
   | zmedico |                                                              |

   | 14014   | Set a limit of 30 backtracking attempts, since it's possible |
   | zmedico | for it to go out of control and take an unreasonable amount  |
   |         | of time.                                                     |

   | 14015   | Bug #281355 - Handle IndexError inside                       |
   | zmedico | reconstruct_eclasses().                                      |

   | 14016   | Add py3k support to _unicode_decode().                       |
   | zmedico |                                                              |

   | 14017   | Add support for unwrapped/overridden attributes in           |
   | zmedico | _unicode_module_wrapper().                                   |

   | 14018   | Add support for an 'encoding' parameter to                   |
   | zmedico | _unicode_module_wrapper(). This will allow creation of       |
   |         | specialize wrappers for merge/unmerge, in case the value of  |
   |         | sys.getfilesystemencoding() is something other than utf_8.   |

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