Merge branch 'master' of ssh://common-lisp.net/var/git/projects/oct/oct
authorRaymond Toy <rtoy@google.com>
Thu, 12 Apr 2012 22:32:00 +0000 (15:32 -0700)
committerRaymond Toy <rtoy@google.com>
Thu, 12 Apr 2012 22:32:00 +0000 (15:32 -0700)

Trivial merge