Forward-port 0.5 r10454 to trunk, minus the version number change.

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

Created by  dolorous  on July 28, 2009
2N2G6L6FNJTEXC2DSC2OP64I7DNAGBL7CQ3WQZGNUCED3FQFOGSQC
Change contents