Merge branch 'dev' into live
authorDylan Lloyd <dylan@psu.edu>
Wed, 12 Jan 2011 00:26:50 +0000 (19:26 -0500)
committerDylan Lloyd <dylan@psu.edu>
Wed, 12 Jan 2011 00:26:50 +0000 (19:26 -0500)

Trivial merge