Merge trunk r1243 into centaur

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

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