merge trunk@1325 into centaur

Conflicts:
	memoize-raw.lisp

git-svn-id: http://acl2-devel.googlecode.com/svn/branches/centaur@1326 5d84a466-a78b-0930-a311-59b22171a541
Merge trunk@1328 into centaur

git-svn-id: http://acl2-devel.googlecode.com/svn/branches/centaur@1329 5d84a466-a78b-0930-a311-59b22171a541