Forward-port updated change list from 0.5 branch r9856 and r9858.

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

Created by  dolorous  on May 31, 2009
V6RTFG4A3BDYDBHKLXISJO34B337IM4Q4FSXXVHXRBWRIPHGDYSQC
Change contents