Apply caotto's patch in [2839372], with a few minor tweaks, to fix a few

issues with Feawn's evolution ability.

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

Created by  dolorous  on August 18, 2009
XCGPG77ZJUVU6TH4Z4I3K677TAG7XTDEEWRP7IGVO7MG7GBVPOSQC
Change contents