[zanata/zanata-server] af938b: Fix manual merge compilation errors.

[GitHub]

  Branch: refs/heads/async-refactor
  Home:   https://github.com/zanata/zanata-server
  Commit: af938bc34db86a1ed8d70bda5d7cfe4490c44eee
      https://github.com/zanata/zanata-server/commit/af938bc34db86a1ed8d70bda5d7cfe4490c44eee
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java

  Log Message:
  -----------
  Fix manual merge compilation errors.

Make sure the translation memory uses of the async classes is working properly.