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

................
  r1441060 | sergeyb | 2013-01-31 16:53:36 +0000 (Thu, 31 Jan 2013) | 16 lines
  
  Merged revisions 1441057 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
  
  ................
    r1441057 | sergeyb | 2013-01-31 16:49:12 +0000 (Thu, 31 Jan 2013) | 9 lines
    
    Merged revisions 1441034 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1441034 | sergeyb | 2013-01-31 16:03:18 +0000 (Thu, 31 Jan 2013) | 1 line
      
      [CXF-4796] Minor updates to protect against NPE when conduit is accessed on JAX-RS ClientConfiguration in the failover mode
    ........
  ................
................


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