Move fix for cygw32 icon issue from emacs-24 branch to trunk as Stefan Monnier requests