Merge branch 'qtupdate'
authorTom Rondeau <trondeau@vt.edu>
Wed, 12 May 2010 01:19:15 +0000 (21:19 -0400)
committerTom Rondeau <trondeau@vt.edu>
Wed, 12 May 2010 01:19:15 +0000 (21:19 -0400)

Trivial merge