Merge branch 'master' of ssh://common-lisp.net/var/git/projects/oct/oct
authorRaymond Toy <rtoy@google.com>
Mon, 16 Apr 2012 17:05:21 +0000 (10:05 -0700)
committerRaymond Toy <rtoy@google.com>
Mon, 16 Apr 2012 17:05:21 +0000 (10:05 -0700)

Trivial merge