Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Tue, 3 May 2011 02:06:18 +0000 (21:06 -0500)
committerChao Mei <chaomei2@illinois.edu>
Tue, 3 May 2011 02:06:18 +0000 (21:06 -0500)
1  2 
src/scripts/configure
src/scripts/configure.in

Simple merge
Simple merge