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

........
  r1483818 | coheigea | 2013-05-17 15:17:56 +0100 (Fri, 17 May 2013) | 10 lines

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

  ........
    r1483811 | coheigea | 2013-05-17 15:06:19 +0100 (Fri, 17 May 2013) | 2 lines

    [CXF-5018] - EHCache TimeToLive value overriden in EHCacheReplayCache

  ........

........


Conflicts:
	rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java

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