Merge remote-tracking branch 'origin/charm' into charm
authorRamprasad Venkataraman <ramv@illinois.edu>
Wed, 19 Sep 2012 20:24:47 +0000 (15:24 -0500)
committerRamprasad Venkataraman <ramv@illinois.edu>
Wed, 19 Sep 2012 20:24:47 +0000 (15:24 -0500)

Trivial merge