Merged from trunk 6861:6867

   Merged from trunk 6861:6867

   +------------------------------------------------------------------------+
   | 6862    | Fix profile and config arguments to NewsItem.isRelevant()    |
   | zmedico | inside NewsManager.updateItems().                            |
   |---------+--------------------------------------------------------------|
   | 6863    | For bug #182346, use dblink.isowner() during unmerge so that |
   | zmedico | device/inode numbers are used to determine ownership         |
   |         | (despite path mismatch due to symlinks).                     |
   |---------+--------------------------------------------------------------|
   | 6865    | In dblink.isowner() don't bother to stat the file when it's  |
   | zmedico | contained in the contents.                                   |
   |---------+--------------------------------------------------------------|
   | 6867    | During unmerge, always verify that the file isn't a symlink  |
   | zmedico | before doing chmod.                                          |
   +------------------------------------------------------------------------+

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