Merged from trunk 9405:9428

   Merged from trunk 9405:9428

   | 9406    | undo registrations of preserved libraries if the merge       |
   | genone  | fails, bug #210501                                           |

   | 9407    | ensure that global variables are used to prevent confusing   |
   | genone  | issues like bug #212055                                      |

   | 9408    | stack use flags from package.use for multiple matching atoms |
   | genone  | (bug #200385)                                                |

   | 9409    | remove FEATURES=livecvsportage                               |
   | genone  |                                                              |

   | 9410    | apply r9408 also for profile-base package.*use* files        |
   | genone  |                                                              |

   | 9411    | Fix typo.                                                    |
   | zmedico |                                                              |

   | 9412    | change stacking order of r9408 so more specific atoms        |
   | genone  | override generic ones                                        |

   | 9413    | fix indentation screwup from r9412                           |
   | genone  |                                                              |

   | 9414    | one more fix to restore correct order for usemask/useforce   |
   | genone  |                                                              |

   | 9415    | Make profile stacking of default USE and package.* slightly  |
   | zmedico | more efficient by skipping list.insert() calls when          |
   |         | possible.                                                    |

   | 9416    | Bug #211949 - As suggested by vapier, tighten the variable   |
   | zmedico | filter to also exclude variable names that begin with a      |
   |         | digit or that contain any non-alphanumeric characters that   |
   |         | are not be supported by bash.                                |

   | 9418    | Quote the file path and uri inside FETCHCOMMAND and          |
   | zmedico | RESUMECOMMAND. Thanks to igli for suggesting.                |

   | 9419    | Fix the regex for bug #211949 so that it correctly matches   |
   | zmedico | variable names that contain more than one non-alphanumeric   |
   |         | character.                                                   |

   | 9421    | Bug #211949 - Tweak the regex so that a leading whitespace   |
   | zmedico | character cannot match the required non-alphanumeric group.  |

   | 9423    | Buf #210372 - Fix FEATURES=suidctl so that it really works   |
   | zmedico | again.                                                       |

   | 9425    | check available space in DISTDIR before trying to fetch/copy |
   | genone  | a file, bug #212152                                          |

   | 9426    | don't list files as being merged when they are ignored due   |
   | genone  | to confmem, bug #212080                                      |

   | 9427    | fix message on ValueError to not sound like crap             |
   | genone  |                                                              |

   | 9428    | tell rpmbuild to clean it's working files after completion,  |
   | genone  | bug #97776                                                   |

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