Apply crash fixes to trunk.

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

Created by  j-p-e-g  on June 22, 2009
4EQI267TNL6F4OA3IKY5WZSWWZKSOBYFYHA7YEEOMIG6FSXBV7EAC
Change contents