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