Merge commit 'origin/master'
authorroot <root@cassidy.cs.princeton.edu>
Wed, 1 Dec 2010 22:46:06 +0000 (17:46 -0500)
committerroot <root@cassidy.cs.princeton.edu>
Wed, 1 Dec 2010 22:46:06 +0000 (17:46 -0500)

Trivial merge