Incorporate patches 1825023 (typos) and 1824868 (bug in fully_contains().)

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2765 c06c8d41-db1a-0410-9941-cceddc491573

Created by  haranp  on November 5, 2007
TXNSD6SHJKIQXADN4AURTPJVSM5YCNFNEP26I4MWOT5CCUKR7ZMQC
Change contents