Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@kappa.(none)>
Sun, 26 Sep 2010 21:59:33 +0000 (17:59 -0400)
committerChris Barker <barker@kappa.(none)>
Sun, 26 Sep 2010 21:59:33 +0000 (17:59 -0400)

Trivial merge