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

Trivial merge