Merge branch 'dev' into live
authorDylan Lloyd <dylan@psu.edu>
Wed, 15 Jun 2011 23:19:42 +0000 (19:19 -0400)
committerDylan Lloyd <dylan@psu.edu>
Wed, 15 Jun 2011 23:19:42 +0000 (19:19 -0400)

Trivial merge