Apply missing bits of 0.4's r6748 to trunk.

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

Created by  dolorous  on August 2, 2008
MRYUR2FR4XTN6J7KNILDIB7ZUNDOXM35BD2C3AT24T4AXQOVD4AAC
Change contents