Merge "master" into "psppsheet" to obtain bug fixes from "master". 20120709001830/pspp 20120710001843/pspp
[pspp] / config /
drwxr-xr-x   ..
-rw-r--r-- 21 .gitignore