Apply my previous commit to trunk.

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

Created by  j-p-e-g  on June 24, 2009
BUEC7H3QAAQM6AULHLEIIRJA7G22J2BTSPN2PNLCIECBZG2QGF5AC
Change contents