Merge branch 'warnings'
authorTom Rondeau <trondeau@vt.edu>
Wed, 24 Nov 2010 22:24:58 +0000 (17:24 -0500)
committerTom Rondeau <trondeau@vt.edu>
Wed, 24 Nov 2010 22:24:58 +0000 (17:24 -0500)

Trivial merge