Merge trunk into Centaur through 1228

git-svn-id: http://acl2-devel.googlecode.com/svn/branches/centaur@1233 5d84a466-a78b-0930-a311-59b22171a541
Merge up to r1232 into Centaur

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