Merge remote-tracking branch 'origin/master' into for-steve
[sxemacs] / etc / photos / jmiller.png
etc/photos/jmiller.png