Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@omega.(none)>
Sat, 27 Nov 2010 04:44:00 +0000 (23:44 -0500)
committerChris Barker <barker@omega.(none)>
Sat, 27 Nov 2010 04:44:00 +0000 (23:44 -0500)

Trivial merge