merge trunk
[bpt/emacs.git] / etc / images / cancel.xpm
etc/images/cancel.xpm