Incorporated changes from Olivier's pariemacs-3.06.
(Got rid of a lot of trailing whitespace in the process.)
Merge branch 'master' of github.com:mhsiah/pariemacs