Forward-port applicable changes from 0.5 r9886 to trunk.

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

Created by  dolorous  on June 5, 2009
YQDQT7JAOUUQ46V7GLOHQRCR7LACJRXASGKPNW2YWRKGMYAUUJ3QC
Change contents