Merged from trunk 6949:6970

   Merged from trunk 6949:6970

   +------------------------------------------------------------------------+
   | 6950    | Update 2.1.3 news for elog stuff.                            |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6952    | Add a note about potential for config mixups in elog         |
   | zmedico | finalizers.                                                  |
   |---------+--------------------------------------------------------------|
   | 6953    | Dump mod_echo elog output inside post_emerge(), just before  |
   | zmedico | the other notifications that happen at exit.                 |
   |---------+--------------------------------------------------------------|
   | 6954    | Document RESTRICT=bindist and add a note about allowance for |
   | zmedico | conditional syntax.                                          |
   |---------+--------------------------------------------------------------|
   | 6955    | Make elog finalize() handling safe for PORTAGE_CONFIGROOT.   |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6956    | Remove confcache docs.                                       |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6959    | Show which $ROOT a package was merged to when $ROOT is not   |
   | zmedico | /.                                                           |
   |---------+--------------------------------------------------------------|
   | 6962    | Add a logrotate config for the save_summary elog module      |
   | zmedico | since it's enabled by default now.                           |
   |---------+--------------------------------------------------------------|
   | 6964    | Remove redundant 'Usage: ' from the usage message.           |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6967    | For bug #182964, replace os.rename() with shutil.move() in   |
   | zmedico | order to handle EXDEV errors that are triggered by layered   |
   |         | filesystems.                                                 |
   |---------+--------------------------------------------------------------|
   | 6969    | s/OSError/EnvironmentError/ since shutil.move() generally    |
   | zmedico | raises an IOError.                                           |
   |---------+--------------------------------------------------------------|
   | 6970    | Revert r6967 since shutil.move() is broken internally.       |
   | zmedico |                                                              |
   +------------------------------------------------------------------------+

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