Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@kappa.(none)>
Sat, 18 Sep 2010 13:33:20 +0000 (09:33 -0400)
committerChris Barker <barker@kappa.(none)>
Sat, 18 Sep 2010 13:33:20 +0000 (09:33 -0400)

Trivial merge