Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@omega.(none)>
Mon, 6 Dec 2010 12:21:36 +0000 (07:21 -0500)
committerChris Barker <barker@omega.(none)>
Mon, 6 Dec 2010 12:21:36 +0000 (07:21 -0500)

Trivial merge