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

................
  r1466340 | ffang | 2013-04-10 14:12:56 +0800 (三, 10  4 2013) | 20 lines
  
  Merged revisions 1466315 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
  
  ................
    r1466315 | ffang | 2013-04-10 09:55:39 +0800 (三, 10  4 2013) | 13 lines
    
    Merged revisions 1465874,1465923 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1465874 | ffang | 2013-04-09 12:08:46 +0800 (二, 09  4 2013) | 1 line
      
      [CXF-4850]commit to expose the problem with CXF-4850
    ........
      r1465923 | ffang | 2013-04-09 16:14:44 +0800 (二, 09  4 2013) | 1 line
      
      [CXF-4850]add WebMethod(operationName=) to the inherit wethod to avoid name conflict in wsdl
    ........
  ................
................


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