Merge commit 'origin/master'
authorroot <root@cassidy.cs.princeton.edu>
Thu, 7 Apr 2011 11:29:59 +0000 (07:29 -0400)
committerroot <root@cassidy.cs.princeton.edu>
Thu, 7 Apr 2011 11:29:59 +0000 (07:29 -0400)

Trivial merge