Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@kappa.linguistics.fas.nyu.edu>
Tue, 30 Nov 2010 21:32:02 +0000 (16:32 -0500)
committerChris Barker <barker@kappa.linguistics.fas.nyu.edu>
Tue, 30 Nov 2010 21:32:02 +0000 (16:32 -0500)

Trivial merge