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

Trivial merge