Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@kappa.linguistics.fas.nyu.edu>
Wed, 8 Jun 2011 18:16:31 +0000 (14:16 -0400)
committerChris Barker <barker@kappa.linguistics.fas.nyu.edu>
Wed, 8 Jun 2011 18:16:31 +0000 (14:16 -0400)

Trivial merge