Merge branch 'charm' of charmgit:charm into charm
authorPritish Jetley <pjetley2@illinois.edu>
Sat, 20 Feb 2010 23:42:42 +0000 (17:42 -0600)
committerPritish Jetley <pjetley2@illinois.edu>
Sat, 20 Feb 2010 23:42:42 +0000 (17:42 -0600)

Trivial merge