Merge branch 'dev'
authorDylan Lloyd <dylan@psu.edu>
Fri, 21 Jan 2011 04:10:12 +0000 (23:10 -0500)
committerDylan Lloyd <dylan@psu.edu>
Fri, 21 Jan 2011 04:10:12 +0000 (23:10 -0500)

Trivial merge