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

........
  r1450178 | ay | 2013-02-26 15:13:10 +0100 (Tue, 26 Feb 2013) | 9 lines
  
  Merged revisions 1450175 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1450175 | ay | 2013-02-26 15:08:43 +0100 (Tue, 26 Feb 2013) | 1 line
    
    fix the mock usage in HTTPConduitURLEasyMockTest
  ........
  
........


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