Merge branch 'charm' of charmgit:charm into charm
authorXiang Ni <xiangni2@illinois.edu>
Tue, 1 Feb 2011 05:49:10 +0000 (23:49 -0600)
committerXiang Ni <xiangni2@illinois.edu>
Tue, 1 Feb 2011 05:49:10 +0000 (23:49 -0600)
1  2 
src/ck-core/init.C

Simple merge