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

Trivial merge