[rhq-project/rhq] 0c726d: Fix merge issue that's killing compile

[Jay Shaughnessy]

Branch: refs/heads/release/jon3.3.x
  Home:   https://github.com/rhq-project/rhq
  Commit: 0c726d4b03d186ce3fa65f7efae2077b24f32db6
      https://github.com/rhq-project/rhq/commit/0c726d4b03d186ce3fa65f7efae2077b24...
  Author: Jay Shaughnessy 
  Date:   2014-08-21 (Thu, 21 Aug 2014)

Changed paths:
    M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataCalcJob.java

Log Message:
  -----------
  Fix merge issue that's killing compile