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

................
  r1515825 | sergeyb | 2013-08-20 16:51:25 +0300 (Tue, 20 Aug 2013) | 13 lines
  
  Merged revisions 1515823-1515824 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1515823 | sergeyb | 2013-08-20 16:38:29 +0300 (Tue, 20 Aug 2013) | 1 line
    
    [CXF-5204] Taking care of TypeVars wrapped in GenericEntity too
  ........
    r1515824 | sergeyb | 2013-08-20 16:46:00 +0300 (Tue, 20 Aug 2013) | 1 line
    
    Minor update to the test
  ........
................


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