Merged from trunk -r13133:13139

   Merged from trunk -r13133:13139

   | 13134   | Make config.features a set instead of a list.                |
   | zmedico |                                                              |

   | 13135   | Add docstrings for the fd_pipes and returnpid parameters of  |
   | zmedico | doebuild().                                                  |

   | 13136   | Make sure mysettings.setcpv() always gets called when        |
   | zmedico | necessary inside doebuild_environment().                     |

   | 13137   | Fix try/except indentation so that 2to3 will recognize it.   |
   | zmedico |                                                              |

   | 13138   | Fix try/except indentation so that 2to3 will recognize it.   |
   | zmedico |                                                              |

   | 13139   | Normalize try/except indentation for compatibility with      |
   | zmedico | 2to3.                                                        |

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