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

........
  r1455590 | coheigea | 2013-03-12 15:57:43 +0000 (Tue, 12 Mar 2013) | 10 lines

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

  ........
    r1455588 | coheigea | 2013-03-12 15:52:00 +0000 (Tue, 12 Mar 2013) | 2 lines

    Some minor security fixes

  ........

........


Conflicts:
	rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SamlTokenBuilder.java

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