Merge remote-tracking branch 'njsf/for-steve' into for-steve
[sxemacs] / etc / trash.xpm
etc/trash.xpm