Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@kappa.linguistics.fas.nyu.edu>
Mon, 8 Nov 2010 20:10:37 +0000 (15:10 -0500)
committerChris Barker <barker@kappa.linguistics.fas.nyu.edu>
Mon, 8 Nov 2010 20:10:37 +0000 (15:10 -0500)

Trivial merge