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

Trivial merge