Revision 159941

The last commit messed up the case where we change
the config file name based on the executable name
(which doesn't seem like such a good idea in the
first case, but anyway....).