Merge commit 'bad1e25ac34e5b0c0cba41a71d136e9c667990a1' into charm reviewed-6.2.2
authorIsaac Dooley <idooley2@illinois.edu>
Wed, 21 Jul 2010 16:34:01 +0000 (11:34 -0500)
committerIsaac Dooley <idooley2@illinois.edu>
Wed, 21 Jul 2010 16:34:01 +0000 (11:34 -0500)

Trivial merge