Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@kappa.(none)>
Sun, 3 Oct 2010 18:33:30 +0000 (14:33 -0400)
committerChris Barker <barker@kappa.(none)>
Sun, 3 Oct 2010 18:33:30 +0000 (14:33 -0400)

Trivial merge