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

........
  r1432076 | coheigea | 2013-01-11 14:56:33 +0000 (Fri, 11 Jan 2013) | 10 lines

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

  ........
    r1432070 | coheigea | 2013-01-11 14:45:58 +0000 (Fri, 11 Jan 2013) | 2 lines

    [CXF-4746] - STS issues invalid SAML 1.1 Assertions under certain conditions

  ........

........


Conflicts:
	services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java

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