Merge branch 'dev'
authorDylan Lloyd <dylan@psu.edu>
Wed, 19 Jan 2011 23:27:28 +0000 (18:27 -0500)
committerDylan Lloyd <dylan@psu.edu>
Wed, 19 Jan 2011 23:27:28 +0000 (18:27 -0500)

Trivial merge