Merge from trunk and resolve conflicts.
[bpt/emacs.git] / etc / images / splash.svg
etc/images/splash.svg