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

........
  r1487839 | coheigea | 2013-05-30 13:58:35 +0100 (Thu, 30 May 2013) | 9 lines

  [CXF-5046] - EncryptedSupportingTokens used with EncryptBeforeSigning does not encrypt Username token

  Conflicts:
  	rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
  	rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
  	systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java
  	systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/stax-server.xml

........


Conflicts:
	rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java

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