Forward-port applicable fixes from 0.5 r9896 to trunk.

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

Created by  dolorous  on June 5, 2009
A566BFFCK7YEC7EDPUSLOL2NCZFMYQKCIOTQTD5NFSXIA22SMR2QC
Dependencies
In channels
main
Change contents