[zanata/zanata] 325a0c: Merge branch 'master' into rhbz803572

[GitHub]

  Branch: refs/heads/rhbz803572
  Home:   https://github.com/zanata/zanata
  Commit: 325a0cec912dfa1e75372b9688aa8c20dbfc9660
      https://github.com/zanata/zanata/commit/325a0cec912dfa1e75372b9688aa8c20dbfc9660
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml

  Log Message:
  -----------
  Merge branch 'master' into rhbz803572

Conflicts:
	server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
	server/zanata-war/src/main/resources/db/db.changelog.xml