Merge branch 'digital'
authorTom Rondeau <trondeau@vt.edu>
Sun, 14 Mar 2010 22:39:03 +0000 (18:39 -0400)
committerTom Rondeau <trondeau@vt.edu>
Sun, 14 Mar 2010 22:39:03 +0000 (18:39 -0400)

Trivial merge