Merged from trunk -r14170:14176

   Merged from trunk -r14170:14176

   | 14171    | Bug #283223 - Don't call str() inside _db_escape_string(),  |
   | zmedico  | since it's redundant and it can trigger a                   |
   |          | UnicodeEncodeError in python-2.x.                           |

   | 14172    | Bug #283223 - Don't call str() on unicode strings inside    |
   | zmedico  | _db_escape_string(), since it can trigger a                 |
   |          | UnicodeEncodeError in python-2.x.                           |

   | 14173    | Fix broken indentation from previous commits.               |
   | zmedico  |                                                             |

   | 14174    | Bug #283292 - Fix FindPortdir() to prevent OSError: [Errno  |
   | zmedico  | 2] from stat when $PWD is unset. Thanks to Jonathan Callen  |
   |          | <en.ABCD@gmail.com> for this patch.                         |

   | 14175    | Add dev-util/gperf to list of suspected run-time            |
   | arfrever | dependencies (bug #283357).                                 |

   | 14176    | Remove reference to GRP_STAGE23_USE (bug #283358).          |
   | arfrever |                                                             |

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