tree 3272f2767714ff744b3134c1d334433e3cd623f3
parent 0ac399e55ae2be82197deee12dc26d1149e97dcd
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1335778380 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1335778380 -0700

Putting back state reconciliation logic.  Other changes