VoltDB/voltdb — pull request #567 by jxchinaren (2013-06-20 19:01:39+00:00)
Title: Eng 4697 to timestamp

Please review the ENG 4695 first as this commit contains changes of ENG4695.