[DEECo] [d3scomp/JDEECo] dc0640: After rebase fixes

[GitHub]

  Branch: refs/heads/DEECoTimeStamps
  Home:   https://github.com/d3scomp/JDEECo
  Commit: dc0640a081377110e11da255ce06a3dbca94a3ad
      https://github.com/d3scomp/JDEECo/commit/dc0640a081377110e11da255ce06a3dbca94a3ad
  Author: rima-alali <alali at d3s.mff.cuni.cz>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/performance/CollectInfo.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/performance/InfoSerializable.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/performance/fsd.java

  Log Message:
  -----------
  After rebase fixes