Merge commit 'origin/master'
authorroot <root@cassidy.cs.princeton.edu>
Tue, 30 Nov 2010 10:10:20 +0000 (05:10 -0500)
committerroot <root@cassidy.cs.princeton.edu>
Tue, 30 Nov 2010 10:10:20 +0000 (05:10 -0500)

Trivial merge