Merge commit 'origin/master'
authorroot <root@cassidy.cs.princeton.edu>
Thu, 2 Dec 2010 23:17:44 +0000 (18:17 -0500)
committerroot <root@cassidy.cs.princeton.edu>
Thu, 2 Dec 2010 23:17:44 +0000 (18:17 -0500)

Trivial merge