Merge branch 'charm' into emenese2/liveVizBoundArray emenese2/liveVizBoundArray
authorEsteban Meneses <emenese2@illinois.edu>
Mon, 23 Jul 2012 16:29:31 +0000 (11:29 -0500)
committerEsteban Meneses <emenese2@illinois.edu>
Mon, 23 Jul 2012 16:29:31 +0000 (11:29 -0500)

Trivial merge