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

Trivial merge