Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Wed, 26 May 2010 22:09:36 +0000 (17:09 -0500)
committerChao Mei <chaomei2@illinois.edu>
Wed, 26 May 2010 22:09:36 +0000 (17:09 -0500)
1  2 
src/scripts/configure
src/scripts/configure.in

Simple merge
Simple merge