Merge commit 'origin/master'
authorroot <root@cassidy.cs.princeton.edu>
Wed, 16 Mar 2011 17:00:33 +0000 (13:00 -0400)
committerroot <root@cassidy.cs.princeton.edu>
Wed, 16 Mar 2011 17:00:33 +0000 (13:00 -0400)

Trivial merge