merge

diff --cc action.cc
index 9c0e29920e362f5d2a2fa7d3681077dad4b7690a,4e3b59a386dce2fc8e5aff8eff4cf778f7902c47..cfdb6e67469d67baa14f02cca00cc49c65e809f0
--- 1/action.cc
--- 2/action.cc
+++ b/action.cc
@@@ -465,7 -429,7 +465,8 @@@ uint64_t ModelAction::get_reads_from_va
        ASSERT(is_read());
        if (reads_from)
                return reads_from->get_write_value();
 -      return VALUE_NONE; /* Only for new actions with no reads-from */
++
 +      return VALUE_NONE;      // Only for new actions with no reads-from
  }
  
  /**