Apply my recent commits to trunk.

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

Created by  j-p-e-g  on June 14, 2009
6DMSDQMAK5FWLGJIZB7HDWAWWEGYMIFLOZH3PXEOWZ2BCRQT3LHAC
Dependencies
In channels
main
Change contents