Apply 0.4 r6816 to trunk.

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

Created by  dolorous  on August 16, 2008
2G3DJ33FMKOTNOLH3X5C3NOZSV3PHL5PJTY4CEHAGDKIYAQXFQEAC
In channels
main
Change contents