Merged revisions 1438085 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1438085 | dkulp | 2013-01-24 12:23:01 -0500 (Thu, 24 Jan 2013) | 10 lines

  Merged revisions 1438078 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1438078 | dkulp | 2013-01-24 12:18:29 -0500 (Thu, 24 Jan 2013) | 2 lines

    [CXF-4765] Intersect the policy timeouts a bit better

  ........

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes@1438090 13f79535-47bb-0310-9956-ffa450edef68
Recording revisions 1438085 via  git from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes



git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes@1438091 13f79535-47bb-0310-9956-ffa450edef68
Blocking revisions 1433137,1437056,1437351,1438086,1438087,1438088 via  git from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes



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