Merged from trunk 6327:6332

   Merged from trunk 6327:6332

   +------------------------------------------------------------------------+
   | 6328      | After talking to marienz, decide that 1 class is better    |
   | WarnerBro | than 4, also realize that UserDict has most of the dict    |
   |           | methods exposed, so drop them. Also add a LoaderError      |
   |           | Exception. Still to do? add a validation callable into the |
   |           | loader to validate data.                                   |
   |-----------+------------------------------------------------------------|
   | 6329      | drop line_count in favor of izip and count(), itertools    |
   | WarnerBro | FOR THE WIN baby.                                          |
   |-----------+------------------------------------------------------------|
   | 6330      | I consulted the python oracle and it told me enumerate was |
   | WarnerBro | better, so go team enumerate                               |
   |-----------+------------------------------------------------------------|
   | 6332      | For bug #173184, handle the CommandNotFound that is        |
   | zmedico   | produced during uninstallation of prelink.                 |
   +------------------------------------------------------------------------+

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