Merge branch 'dev' into live
authorDylan Lloyd <dylan@psu.edu>
Tue, 18 Jan 2011 23:51:01 +0000 (18:51 -0500)
committerDylan Lloyd <dylan@psu.edu>
Tue, 18 Jan 2011 23:51:01 +0000 (18:51 -0500)

Trivial merge