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

................
  r1485437 | sergeyb | 2013-05-22 22:33:20 +0100 (Wed, 22 May 2013) | 9 lines
  
  Merged revisions 1485284 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1485284 | sergeyb | 2013-05-22 17:58:24 +0100 (Wed, 22 May 2013) | 1 line
    
    [CXF-5021] Allowing to customize static media types, using ResourceManager to load the resources
  ........
................


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