Merged revisions 1464542 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

................
  r1464542 | sergeyb | 2013-04-04 16:45:59 +0300 (Thu, 04 Apr 2013) | 16 lines
  
  Merged revisions 1464538 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
  
  ................
    r1464538 | sergeyb | 2013-04-04 16:43:15 +0300 (Thu, 04 Apr 2013) | 9 lines
    
    Merged revisions 1464532 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1464532 | sergeyb | 2013-04-04 16:38:52 +0300 (Thu, 04 Apr 2013) | 1 line
      
      [CXF-4946] Better resolving of relative references with parent folders
    ........
  ................
................


git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes@1464550 13f79535-47bb-0310-9956-ffa450edef68