Integrated patch 1828014 (spell order).

Also unbroke trunk build. Oops.

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

Created by  haranp  on November 8, 2007
F677A4D5TGEJKQM7YIUXP7OW2YHQRDXQAH22CY7EXYLDFTU4NXOQC
Change contents