Merge from emacs--rel--22
[bpt/emacs.git] / etc / images / preferences.xpm
etc/images/preferences.xpm