Merge branch 'tonylocal' of git://repo.or.cz/CommonLispStat.git into lsobjToProto