Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <tg455581@login3.ranger.tacc.utexas.edu>
Sat, 20 Feb 2010 19:50:08 +0000 (13:50 -0600)
committerGengbin Zheng <tg455581@login3.ranger.tacc.utexas.edu>
Sat, 20 Feb 2010 19:50:08 +0000 (13:50 -0600)

Trivial merge