Merge branch 'xiang/optChkp' of charmgit:charm into charm
authorXiang Ni <xiangni2@illinois.edu>
Thu, 25 Oct 2012 20:46:31 +0000 (15:46 -0500)
committerXiang Ni <xiangni2@illinois.edu>
Thu, 25 Oct 2012 20:46:31 +0000 (15:46 -0500)

Trivial merge