Merge branch 'resampler'
authorTom <trondeau@vt.edu>
Sun, 17 Jan 2010 21:48:21 +0000 (16:48 -0500)
committerTom <trondeau@vt.edu>
Sun, 17 Jan 2010 21:48:21 +0000 (16:48 -0500)

Trivial merge